Add support for child components