added overrides for display and datamodel