Add flag for normal cloning