merging data api updates from yo-pinz branch into master