Preliminary fix, before code rewrite
Added TODOs for missing child notifications