Remove and add mappings