Added support for passing in client options