Added JSON serialization to model