Better management of submodules (not as submodules :) )