DataMapper Criteria refactoring