Add forked parent field support