Refactored expression objects