Adding options to override endpoint, version and protocol