Added type and exceptional description cases