Add FunctionExpression type
Remove old code