Added guard back to datasource