Use reviver for all types