Added some JSON structuring