Update code to work with updated submodule