refactored to handle new m2nodehandler
Fixed merge issue