Code cleanup
Child collection modifications work better now