added symbol as Enum
added more symbol for name clashes