Fixes SSoup return types and adds more enrichments