Added save/load demand scenarios