Added json struct tags