Updated the mapper to read the files properly