More changes to the vigor framework