Added json deserialization