diff --git a/acars_aircrafts.h b/acars_aircrafts.h
index 7838d34..a4c4822 100644
--- a/acars_aircrafts.h
+++ b/acars_aircrafts.h
@@ -1,4 +1,11 @@
-const char * acars_aircrafts[][4]={
+struct acars_aircraft {
+	char *reg;
+	char *carrier_icao;
+	char *type;
+	char *cn;
+};
+
+const struct acars_aircraft acars_aircrafts[]={
 {"0001", "---", "Airbus A319CJ", "1468"},
 {"00355S", "USM", "Boeing KC-135R", "18130"},
 {"01", "USM", "Gulfstream C-37", "653"},
diff --git a/acars_aircrafts_dot.h b/acars_aircrafts_dot.h
index 0cb5100..15f676d 100644
--- a/acars_aircrafts_dot.h
+++ b/acars_aircrafts_dot.h
@@ -1,4 +1,13 @@
-const char * acars_aircrafts_dot[][4]={
+#if 0
+struct acars_aircraft {
+	char *reg;
+	char *carrier_icao;
+	char *type;
+	char *cn;
+};
+#endif
+
+const struct acars_aircraft acars_aircrafts_dot[]={
 {".0001", "---", "Airbus A319CJ", "1468"},
 {".00355S", "USM", "Boeing KC-135R", "18130"},
 {".01", "USM", "Gulfstream C-37", "653"},
diff --git a/main.c b/main.c
index 3d03df9..4564c83 100644
--- a/main.c
+++ b/main.c
@@ -68,22 +68,22 @@ void print_mesg(msg_t * msg)
 	printf("Aircraft reg: %s, ", msg->addr);
 	printf("flight id: %s\n", msg->fid);
 	i=0;
-	while(acars_aircrafts[i][0]){
-		if(!strcmp(acars_aircrafts[i][0],(const char*)msg->addr)){
-			printf("Aircraft type: %s, ",acars_aircrafts[i][2]);
-			printf("carrier: %s, ",acars_aircrafts[i][1]);
-			printf("cn: %s\n",acars_aircrafts[i][3]);
+	while(acars_aircrafts[i].reg){
+		if(!strcmp(acars_aircrafts[i].reg,(const char*)msg->addr)){
+			printf("Aircraft type: %s, ",acars_aircrafts[i].type);
+			printf("carrier: %s, ",acars_aircrafts[i].carrier_icao);
+			printf("cn: %s\n",acars_aircrafts[i].cn);
 			break;
 		}
 		i++;
 	}
 
 	i=0;
-	while(acars_aircrafts_dot[i][0]){
-		if(!strcmp(acars_aircrafts_dot[i][0],(const char*)msg->addr)){
-			printf("Aircraft type: %s, ",acars_aircrafts_dot[i][2]);
-			printf("carrier: %s, ",acars_aircrafts_dot[i][1]);
-			printf("cn: %s\n",acars_aircrafts_dot[i][3]);
+	while(acars_aircrafts_dot[i].reg){
+		if(!strcmp(acars_aircrafts_dot[i].reg,(const char*)msg->addr)){
+			printf("Aircraft type: %s, ",acars_aircrafts_dot[i].type);
+			printf("carrier: %s, ",acars_aircrafts_dot[i].carrier_icao);
+			printf("cn: %s\n",acars_aircrafts_dot[i].cn);
 			break;
 		}
 		i++;