Updated for new submodule