Use fetch instead of find
Rakefile updates
Scenario updates