Add clone skip feature