Modified Loader and Autoloader

to use a common trait