major update to data source api and environment