change datacatalog to get all data at once