Refactored the query to use Criteria