added component genration and other updates