Revert @Id and @parentId fields are stored twice