Small refactor Enumerations class