Remade all statics with Singletons