Added the engine velocity to merge params into xml and adjustments
to the entities.