Update function calling according to latest code
Update function calling according to latest code