Refactoring for a new approach, not doing Enumerated Types anymore