Added fields for p2000 messages