added additional options to ClientBuilder