Enhanced the Rakefile