Adding support for submodules