Added DemandSetFactory