Added type fields to incomings and outgoings