Add vigor support