Adding support for JSON models