Cleaning up Model constructor with modelOptions