Improve data loading process, prevent duplicate API calls