Enhanced the loader and updated changelog