added expressionbuilder class