Refactor ModelDefinition into ComponentModel