Add Function cast to fix Enrichers issue
Fix Enrichers type param usages