Added StringExpression, LiteralExpression, FunctionCallExpression