Refactor, Redesign, AddExpression removed, replaced by BinaryArithmeticExpression with add operator