A few changes for a url-partitioning use case - View it on GitHub