better support for fields in model