updated struct.go