Switched to Criteria API in DAO finder methods