Made some updates to how datasource is pulling in