Continue work on Json serialization