Mapping object and file reader refactor