Changed self to a static class