Further update Rakefile