Adapt to changes in data model 0.3.0