Improve copy/paste mappings