Readded OPIS Patch with NetDataList Modification