added component support