Refactoring. Enum type helper
Refactoring. Object and Enum types