New submodules and a compatibility shim.