Making the Model API more consitent with EntityType