Added Submodules and Comment functionality