fixed data to have proper dictionaries
Merge branch 'refs/heads/robyn_dev' into shubham_dev