Improve initial data load