Change source structure according to OSCI-991