Updated to point to latest submodules