Merge all connector options

See #41
This will allow more flexible configuration.