Making submodules D9 compatible