Updated the mappings and fixed a bug