Upgrade to submodules