Upgrade to support https