Stage 2: added submodules