Added missing resolvers for nrv