Updated classes names
Added the first methods to the NDiMapper type