Adding component(1) support