tag mock support
replace Rivet reference