Improve copy-paste