Added more enrichments and cleaner function return