Adding support for module routing