Added support for adding and removing children