Add children feature and test