Adapt to libnpa