Implemented singletons and changed class methods to instance methods