Code cleans + ObjectCreator is now available to all containers