Improvements to Setup Rake Tasks