change clone logic for services