Added 2 scenarios and misc changes to support scenarios