Made the Client able to skip the location broker