Modify rakefile and some associated