Added support for Fenix Framework