move constants to 2 new Enum