Added component generator