Make it to work with Cake 2