Making it easier to add scenarios and criteria.