Feature/#882 lazy criteria