I am guessing that this is not related to the bigger changes, but simplifies json serialization/deserialization stuff.