fixed implementation issues
updated enrichment function names