Moved vpn objects under Circuit