made instantiation of classes uniform with singletons