Changed instance class to static class