Adding connection $options back somewhere it was needed, after code
refactoring in connection model.