Add support for more connection options