Component Configuration improvements
Component Configuration improvements