Refactored + VPN handling