Adding support for the generic writer and moving Demand Set and profile to scenario