Extended entities, added models