Updated Rake tasks