Updated for new Loader Version