Adds support for urlquoting and multiple storage locations.