Adapt to new libnpa