Changed to static class