Adding Namespace and update parseQuery