Improve loading method