Changes to make reverse cloning possible