Update for nozomi support