Criteria Factory now uses the Kao Factory