Type.type field renamed to Type.id