Added Rake stuff