added json struct tags