Add support for @Recover