Upgrade to CakePHP 2.2+