Added JSON Serializtion code