Bake now uses Bake for building