Adapt JS to use new data model
For #9-semweb-model