Update to Velocity 1.7