Adding enum as singleton classes