added criteria class