Changed from static class to instance.