Add support for submodules and paths