Few JSON Model Bugfixes