Changes to Loader