Updated configuration and submodule scripts