Updated namespace & removed cluster search