Added additive and booleans to parser