Refactoring of VelocityMarshaller and fixed bug where a new velocity
entity was created but not added to the list of entities when performing
the reverse mapping of complex types.