Changes to work with PHP-MMCFE-NG