Updated to add references and children