Refactor and removed selectedCriteria method