Rivet - Gen 1 Support