Schema + addParentInfo changes