Masterfactory is now a Singleton