Updating deprecated functions