Update to new new data model
Update to new new data model

neiljerram/felix,alexhersh/calico,Metaswitch/calico,neiljerram/felix,neiljerram/felix,TrimBiggs/calico,matthewdupre/felix,matthewdupre/felix,kasisnu/calico,beddari/calico,kasisnu/calico,TrimBiggs/calico,ocadotechnology/calico,beddari/calico,ocadotechnology/calico,anortef/calico,Metaswitch/calico,anortef/calico,neiljerram/felix,alexhersh/calico