Add some more useful mappings