better entity model support