Improve data loading