Added generator specs
fixed common helper criterias