Enhancements on the Loader class.