diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h
index d8b4c3e..e85adf8 100644
--- a/include/openbsc/gsm_data.h
+++ b/include/openbsc/gsm_data.h
@@ -224,6 +224,17 @@
 	} bb_transc;
 
 	u_int16_t arfcn;
+
+	union {
+		struct {
+			struct {
+				struct gsm_nm_state nm_state;
+			} bbsig;
+			struct {
+				struct gsm_nm_state nm_state;
+			} pa;
+		} bs11;
+	};
 	struct gsm_bts_trx_ts ts[TRX_NR_TS];
 };
 
@@ -274,6 +285,10 @@
 	u_int16_t available_slots;
 };
 
+struct gsm_envabtse {
+	struct gsm_nm_state nm_state;
+};
+
 /* One BTS */
 struct gsm_bts {
 	struct gsm_network *network;
@@ -323,7 +338,7 @@
 			struct {
 				struct gsm_nm_state nm_state;
 			} rack;
-
+			struct gsm_envabtse envabtse[4];
 		} bs11;
 	};