New PlanDataAPI
Merge branch 'hotfix/Data_API'