More changes to reflect the new submodule