edited model/json parser