assets and factories moved to singletons