Added consumer and type fields to matrix