Better support for Nidever