Update for new getComponentInstance API