[Equivalence Plan] Refactored to comply with the new Generated API