Improved File Loader and added wrappers