Rework Rake tasks