url scheme handling moved inside Client