Added component scan