Updated models and support for display_reference