Added code to GENERAL_NAME with support for more options and preliminary