Added type field