Add a couple of extra mappings