Improve initial load performance