Changes to support SSL connections