Updated to Cake 2 version