Added option for building submodules