Improve copy function