Adding support for 'Error', 'Warning', and addition / subtraction.