Add submodules
Minor modifications