Moving DemandProfileFactory to scenario