Cleaning up and adding more mappings