Add support for filter operation and cleanup namespace