Improved bake scripts