added basic uri parsing