Add support for setup with uri and options passed in separately