- applied latest changes of CDO API