Updated to use common elements as submodules.