Changed NMVector and NMMatrix classes