Sync with nbs