follow changes in OKS ODI structure