Refactored to handle m2nodehandler