Improve Loader speed