Update to work with latest Spinn Submodule