Added component(1) support