Rename .make_clone to .build_clone and use while list on before filter instead of black list