Remodel entities
Adapt JSONParser calls to match new model
Merge branch 'master'
Adapt call to Connect HTTP Service to match newest signature