Add more support for uri parsing