Refactoring: Expression
Added: Constant, Variable (type of Expression)