Add support for extra connection options