Migrate to FenixFramework 2