Updated EquipmentType and Equipment models