Adjustments to the velocity parser