Updated function calls to latest changes