restructured API for Data