Code updated to latest version of model.json

Change-Id: I608b852467bcc8008e6cd79e43238f558414418b