More support in rakefile