Improved vows to the 0.7.0