Incremental check in
Fix model definition