improve support for jsonmodel