update namespace and fetching logic