Convert to static class coding