Added type field to the finishing NULL entry