add json keys to structs for re-encoding