Update for cake 2.4