Added missing submodules (hopefully)