updated to take into account new json-merge datamodel