Expansion of V1 and V2 message support+tests