change API to adjust issue with data loading callbacks