Updated rakefile for further updates