Switched from Velocity 1.6 to Velocity 1.7.