Improve source laading