Finalised DemandView and SupplyView classes