Improved Rake task.