More structural redesign of the propagation of sub-classes onto the root object