deleted enums and added static class with constants