Refractor to meet the latest changes
Updated the xdebug to match MySQL