Added model and JSON parsing