Move criterias to specific class