Refactor: Updated code to comply with the Fenix Framework 2 API