Several changes to support router nodes in the language