diff --git a/glossary.rst b/glossary.rst
index ecc4dce..00ebcb0 100644
--- a/glossary.rst
+++ b/glossary.rst
@@ -3,28 +3,42 @@
 
 Protocols
 ---------
-- NGAP
-- S1AP
-- Diameter
-- NAS
-- PFCP
+- NGAP: NG Application Protocol used over N2 interface
+- S1AP: S1 Application Protocol used over S1-AP interface
+- Diameter: S6a
+- NAS: Non-Access-Stratum used between UE & MME/AMF.
+- PFCP: Packet Forwarding Control Protocol
 - GTPv1
 - GTPv2
 
 Network Functions
 -----------------
 
-- AMF: Access Management Function
+- AMF: Access and Mobility Management Function
 - UPF: User Plane Function
 - SMF: Session Management Function
 - NRF: Network Repository Function
 - NSSF: Network Slice Selection Function
 - PCF: Policy & Charging Function
-- AUSF: Authentication Function
-- UDM: Unified Data Management Function
-- UDR: Unified Data Repository Function
+- AUSF: Authentication Server Function
+- UDM: Unified Data Management
+- UDR: Unified Data Repository
+- CHF: Charging Function
+- NWDAF: Network Data Analytics Function
+- NEF: Network Exposure Function
+- MME:  Mobility Management Entity
+- SGW: Serving Gateway
+- PGW: PDN Gateway
+- HSS: Home Subscriber Server
+- PCRF: Policy and Charging Rule Function
 
 3gpp Interfaces
 ---------------
-- N4 : SMF to UPF
+- N2: gNodeB to AMF interface
+- N4: SMF to UPF interface
 - SBI interface
+- S1AP: eNodeB to MME interface
+
+Misc
+----
+SA: Standalone Architecture