changed types to ordered sets

prefer ordered sets in entity