Updated Rakefile with additional support