Added support for copying and newer