Customized to new Core models and field types