Updated to support cf vpc setup