Refactoring for better integration with i-MSCP 1.2.x