CMS-3381 Improve and align data api in TS and Java