Criteria api done. Need to integrate with queries.