Removed global args, added vpc support.