added criteria filed for geneartion