Refactor - move ENUMS