Cakefile updates