Added a new primitive entity type and some new collection constraints