support for alternative data_api

Change-Id: I048989aefcad854fc0948d6e2a23d1234c484840