Added custom criterion class.