Added way to get component instance from ComponentChoice