Migrated enumerations to new file