Added component control