Added json tags to structs