Robust recovery mechanism for edge cases with subclasses / fresh versions