Updated data and data scripts