Refactored for new m2nodehandler
Refactored for new m2nodehandler