Added type fields for the various nodes