Even more message trace flexibility

Next step is to put extra in a new separate annotation field.