More class creation delegation to the ObjectFactory