diff --git a/error.h b/error.h
index 6c9dd54848c8bfd33f20996cb3470f9ae70d1935..519e5ea52b97ae2d968e8a7f2a022ad31c867a93 100644
--- a/error.h
+++ b/error.h
@@ -4,7 +4,37 @@
 /*! @brief Status message enumeration*/
 
 enum {
-	LIBMOBILE_STATUS_OK,
+	LIBMOBILE_SSTATUS_SUCCESS,
+	LIBMOBILE_SSTATUS_SIM_ACTIVATED,
+	LIBMOBILE_SSTATUS_NEW_PIN_SET,
+	LIBMOBILE_SSTATUS_PIN_DISABLED,
+	LIBMOBILE_SSTATUS_PIN_ENABLED,
+	LIBMOBILE_SSTATUS_PIN_CORRECT,
+	LIBMOBILE_SSTATUS_SIM_UNLOCKED,
+	LIBMOBILE_SSTATUS_PROFILE_SET,
+	LIBMOBILE_SSTATUS_PROFILE_CREATED,
+	LIBMOBILE_SSTATUS_PROFILE_DELETED,
+	LIBMOBILE_SSTATUS_CONNECTION_CONNECT_ATTEMPT,
+	LIBMOBILE_SSTATUS_CONNECTION_DISCONNECT_ATTEMPT,
+	LIBMOBILE_SSTATUS_ROAMING_ENABLED,
+	LIBMOBILE_SSTATUS_ROAMING_DISABLED,
+	__LIBMOBILE_SUCCESS_MAX
+};
+
+enum {
+
+	LIBMOBILE_GSTATUS_CONNECTION_CONNECTED,
+	LIBMOBILE_GSTATUS_CONNECTION_DISCONNECTED,
+	LIBMOBILE_GSTATUS_NETWORK_ENABLED,
+	LIBMOBILE_GSTATUS_NETWORK_DISABLED,
+	LIBMOBILE_GSTATUS_SIM_ACTIVATED,
+	LIBMOBILE_GSTATUS_PIN_ENABLED,
+	LIBMOBILE_GSTATUS_PIN_DISABLED,
+	__LIBMOBILE_GENERIC_MAX
+};
+
+enum {
+	LIBMOBILE_STATUS_FAIL,
 	LIBMOBILE_STATUS_NO_DEVICE,
 	LIBMOBILE_STATUS_SIM_NOT_ACTIVE,
 	LIBMOBILE_STATUS_SIM_ACTIVE,