Updated clone utils with state type changes