diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
index 538280a..fb69718 100644
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@@ -38,6 +38,15 @@
 #include <bl_common.h>
 #include <bl31.h>
 #include <runtime_svc.h>
+#include <context_mgmt.h>
+
+/*******************************************************************************
+ * Simple function to initialise all BL31 helper libraries.
+ ******************************************************************************/
+void bl31_lib_init()
+{
+	cm_init();
+}
 
 void bl31_arch_next_el_setup(void);
 
@@ -59,7 +68,8 @@
 #if defined (__GNUC__)
 	printf("BL31 Built : %s, %s\n\r", __TIME__, __DATE__);
 #endif
-
+	/* Initialise helper libraries */
+	bl31_lib_init();
 
 	/* Initialize the runtime services e.g. psci */
 	runtime_svc_init(mpidr);