Correctly passing connection options all the way