Rake tasks improved