Added the final mappings.

It might be a good idea to recheck them to make sure though...