Refactored atomic types into ExpressionAtom