Editing for API changes
Added #parent, #children and tests