Feature/new mappings