Adding revised model node factory and visitor framework.