Added PBPJson class, modified existing json classes