Moved Enums into Constant  class