Improved CakePHP support