Sync with libnpa