Start changing the existing evaluators to use the Hql and Criteria Query Builder implementations