Refactored to use Uri not string