Update "buildExpression" function