Move constants to static class