Nsm: some updates in architecture and design