Added the Loader and fixed drivers to include this new feature