getParent added, child storage performance refactoring