Improve data loading.