Moved singleton responsibility to single class