Sync with nmc.js