Made changes to DataAPI