adding uri parsing