Rewrite of the parent update framework, more work done