Migrate to fenix-framework 2