Added component-dir