Added submodules for completion and highlighting