added some nice mappings