*8787* Adapt data creation scripts for OMP