Shouldn't this stick to the same schema as above i.e. http://commtrack.org/supply_point_product