- Optimize ModelData when used with very few properties (#772)