Submodule improvements