Making contact use submodules