Made Entity subtype hierarchy