Refactors, working on smart collection criterias