Convert managers to singletons