diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation.c b/src/libimcv/plugins/imc_attestation/imc_attestation.c
index f0de1c845..43a481b3d 100644
--- a/src/libimcv/plugins/imc_attestation/imc_attestation.c
+++ b/src/libimcv/plugins/imc_attestation/imc_attestation.c
@@ -205,18 +205,10 @@ TNC_Result TNC_IMC_ReceiveMessage(TNC_IMCID imc_id,
 			{
 				case TCG_PTS_REQ_PROTO_CAPS:
 					break;
-				case TCG_PTS_DH_NONCE_PARAMS_REQ:
-					break;
-				case TCG_PTS_DH_NONCE_FINISH:
-					break;
 				case TCG_PTS_MEAS_ALGO:
 					break;
 				case TCG_PTS_GET_TPM_VERSION_INFO:
 					break;
-				case TCG_PTS_REQ_TEMPL_REF_MANI_SET_META:
-					break;
-				case TCG_PTS_UPDATE_TEMPL_REF_MANI:
-					break;
 				case TCG_PTS_GET_AIK:
 					break;
 					
@@ -225,13 +217,17 @@ TNC_Result TNC_IMC_ReceiveMessage(TNC_IMCID imc_id,
 					break;
 				case TCG_PTS_GEN_ATTEST_EVID:
 					break;
-				case TCG_PTS_REQ_FILE_META:
-					break;
 				case TCG_PTS_REQ_FILE_MEAS:
 					break;
+				
+				/* TODO: Not implemented yet */
+				case TCG_PTS_DH_NONCE_PARAMS_REQ:
+				case TCG_PTS_DH_NONCE_FINISH:
+				case TCG_PTS_REQ_FILE_META:
 				case TCG_PTS_REQ_INTEG_MEAS_LOG:
-					break;
-					
+				/* Attributes using XML */
+				case TCG_PTS_REQ_TEMPL_REF_MANI_SET_META:
+				case TCG_PTS_UPDATE_TEMPL_REF_MANI:
 				/* On Windows only*/
 				case TCG_PTS_REQ_REGISTRY_VALUE:
 				/* Received on IMV side only*/
diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation.c b/src/libimcv/plugins/imv_attestation/imv_attestation.c
index 2aa52d838..2fd472d89 100644
--- a/src/libimcv/plugins/imv_attestation/imv_attestation.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation.c
@@ -201,14 +201,10 @@ TNC_Result TNC_IMV_ReceiveMessage(TNC_IMVID imv_id,
 			{
 				case TCG_PTS_PROTO_CAPS:
 					break;
-				case TCG_PTS_DH_NONCE_PARAMS_RESP:
-					break;
 				case TCG_PTS_MEAS_ALGO_SELECTION:
 					break;
 				case TCG_PTS_TPM_VERSION_INFO:
 					break;
-				case TCG_PTS_TEMPL_REF_MANI_SET_META:
-					break;
 				case TCG_PTS_AIK:
 					break;
 				
@@ -217,17 +213,17 @@ TNC_Result TNC_IMV_ReceiveMessage(TNC_IMVID imv_id,
 					break;
 				case TCG_PTS_SIMPLE_EVID_FINAL:
 					break;
-				case TCG_PTS_VERIFICATION_RESULT:
-					break;
-				case TCG_PTS_INTEG_REPORT:
-					break;
-				case TCG_PTS_UNIX_FILE_META:
-					break;
 				case TCG_PTS_FILE_MEAS:
 					break;
+				
+				/* TODO: Not implemented yet */
+				case TCG_PTS_DH_NONCE_PARAMS_RESP:
+				case TCG_PTS_UNIX_FILE_META:
 				case TCG_PTS_INTEG_MEAS_LOG:
-					break;
-					
+				/* Attributes using XML */
+				case TCG_PTS_TEMPL_REF_MANI_SET_META:
+				case TCG_PTS_VERIFICATION_RESULT:
+				case TCG_PTS_INTEG_REPORT:
 				/* On Windows only*/
 				case TCG_PTS_WIN_FILE_META:
 				case TCG_PTS_REGISTRY_VALUE:
@@ -246,7 +242,7 @@ TNC_Result TNC_IMV_ReceiveMessage(TNC_IMVID imv_id,
 				case TCG_PTS_REQ_FILE_MEAS:
 				case TCG_PTS_REQ_INTEG_MEAS_LOG:
 				default:
-					DBG1(DBG_IMC, "received unsupported attribute '%N'",
+					DBG1(DBG_IMV, "received unsupported attribute '%N'",
 						tcg_attr_names, attr->get_type(attr));
 					break;
 			}