Added cloning to ease dataset creation