Various data loading changes.