Adding error message / type support