Extended URI module
Refactor providers to use ExtendedURI module