Resolve ProductExtend structure issue