CHANGE: Loader class

Loader Class to master branch