Support for multiple children and formatting fixes