[noco] Modernize