Update to latest component-discovery