Improve loading speed and performance