Move criteria to dedicated package