depic models + remove .class in Enrichment service