Re: Legacy NAP/NSP support