Last changes before switching to use full ids with the parent path included.