Adjusted the component API