Updated rakefile and plugins