Refactoring of Enums and Enumerations
Enums and strings are now working correctly. Minor bug