Intermediate commit do diagnose missing links
Fix return of hydrator instead of pass thru