switch from xml to json / use new pbm api namespace
Merge branch 'enhancements'