Criteria refactoring continues