Added some more mappings and encoding