Added support for children