Added URI parsing class
Update deps