No need to recode the data api, ported from FE 1