Finalised enumerations refactoring..