Adjust ETL with new data stores