No longer using Uri or System.Linq which doesnt seem to work in 158