Corrected the MACRO to define the vector size

Can now handle both a previous field in the message
or
A user defined functor