Updated to work with Rivet 2.0