Adds both svpn and gvpn support