Extend to accept clone parameter (without tests)