Properly use parseModel(s) and allow extension (#1246, #1272).
Merge pull request #1325 from bitovi/model-prop-overwrite

Properly use parseModel(s) and allow extension