Add VPN agent waiting cycle
Common improvements