add CallExpression and NewExpression support