Make compatible with CakePHP 2.2+