modeling VPN gateways, improved development infrastructure