Initial commit, support for additional connection parameters.