Feature/better vpn control