Updated clone method