Added other mappings and resolve file