Index: branches/t3e-tools/t3q/src/org/etsi/t3q/config/EmbeddedExtensionConfig.java
===================================================================
--- branches/t3e-tools/t3q/src/org/etsi/t3q/config/EmbeddedExtensionConfig.java	(revision 27)
+++ branches/t3e-tools/t3q/src/org/etsi/t3q/config/EmbeddedExtensionConfig.java	(revision 27)
@@ -0,0 +1,32 @@
+package org.etsi.t3q.config;
+
+public class EmbeddedExtensionConfig {
+	private boolean checkWaitStatementPrecededByLog = true;
+	private boolean checkNoNestedModes = true;
+	private int allowedModeNestingDepth = 2;
+
+	public boolean isCheckWaitStatementPrecededByLog() {
+		return checkWaitStatementPrecededByLog;
+	}
+
+	public void setCheckWaitStatementPrecededByLog(
+			boolean checkWaitStatementPrecededByLog) {
+		this.checkWaitStatementPrecededByLog = checkWaitStatementPrecededByLog;
+	}
+
+	public void setCheckNoNestedModes(boolean checkNoNestedModes) {
+		this.checkNoNestedModes = checkNoNestedModes;
+	}
+
+	public boolean isCheckNoNestedModes() {
+		return checkNoNestedModes;
+	}
+
+	public void setAllowedModeNestingDepth(int allowedModeNestingDepth) {
+		this.allowedModeNestingDepth = allowedModeNestingDepth;
+	}
+
+	public int getAllowedModeNestingDepth() {
+		return allowedModeNestingDepth;
+	}
+}
Index: branches/t3e-tools/t3q/src/org/etsi/t3q/config/NamingConventionsConfig.java
===================================================================
--- branches/t3e-tools/t3q/src/org/etsi/t3q/config/NamingConventionsConfig.java	(revision 26)
+++ branches/t3e-tools/t3q/src/org/etsi/t3q/config/NamingConventionsConfig.java	(revision 27)
@@ -16,4 +16,6 @@
 	private String signatureTemplateRegExp = "s_[a-z].*";
 	private String portInstanceRegExp = "[a-z].*";
+	private String messagePortInstanceRegExp = "mp_.*";
+	private String streamPortInstanceRegExp = "sp_.*";
 	private String componentInstanceRegExp = "[a-z].*";
 	private String constantRegExp = "c_[a-z].*";
@@ -266,3 +268,19 @@
 	}
 
+	public void setMessagePortInstanceRegExp(String messagePortInstanceRegExp) {
+		this.messagePortInstanceRegExp = messagePortInstanceRegExp;
+	}
+
+	public String getMessagePortInstanceRegExp() {
+		return messagePortInstanceRegExp;
+	}
+
+	public void setStreamPortInstanceRegExp(String streamPortInstanceRegExp) {
+		this.streamPortInstanceRegExp = streamPortInstanceRegExp;
+	}
+
+	public String getStreamPortInstanceRegExp() {
+		return streamPortInstanceRegExp;
+	}
+
 }
Index: branches/t3e-tools/t3q/src/org/etsi/t3q/config/QualityCheckProfile.java
===================================================================
--- branches/t3e-tools/t3q/src/org/etsi/t3q/config/QualityCheckProfile.java	(revision 26)
+++ branches/t3e-tools/t3q/src/org/etsi/t3q/config/QualityCheckProfile.java	(revision 27)
@@ -73,4 +73,5 @@
 
 	private RealtimeExtensionConfig realtimeExtensionConfig = new RealtimeExtensionConfig();
+	private EmbeddedExtensionConfig embeddedExtensionConfig = new EmbeddedExtensionConfig();
 	
 	public RealtimeExtensionConfig getRealtimeExtensionConfig() {
@@ -547,4 +548,12 @@
 	}
 
+	public void setEmbeddedExtensionConfig(EmbeddedExtensionConfig embeddedExtensionConfig) {
+		this.embeddedExtensionConfig = embeddedExtensionConfig;
+	}
+
+	public EmbeddedExtensionConfig getEmbeddedExtensionConfig() {
+		return embeddedExtensionConfig;
+	}
+
 
 }