Added support for child mapping