added support for model field definitions