Added models and JSON representations