added generalization for incentive type and steps