[Equivalence Plan] Refactored to use the Fenix Framework 2 API
[Equivalence Plan] Refactored to comply with the new Generated API