Refactoring default enumerations...