Added new data_source field. Change facility_id to string.