Improved handling of the new object manager.