moved model component properties properties back out to top level sub-section