Updated CategorizationEngine