Minor updates
Add support for dependent components discovery