Update to use Velocity 1.1