Loader improvments