Added Enumerated class for refactoring.