Further improvements to the URI Traversal