Added submodule support