Adapt to libnpa/new