Added missing criteria