added farm_id to fields