VIVO-112: another round of updates to support the ISF changes