Switch to submodules for unimpaired and commentary