Make Cakefile a bit more abstract