diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/metadata/jsf_metadataprocessing2.xml b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/metadata/jsf_metadataprocessing2.xml
index 5cf8a23..6b6e098 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/metadata/jsf_metadataprocessing2.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/metadata/jsf_metadataprocessing2.xml
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar-annotation 
-	xmlns="http://org.eclipse.jsf.core/grammarAnnotationSchema"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
->
+<md:metadatamodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" 
+	xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore"
+	xmlns:mdt="http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore"  
+	id=" http://org.eclipse.jsf/metadataprocessing"
+	type="tagFile">
 
-  <cm-element name="MyTag">
-  	<cm-attribute name="MyDualTypeAttr">
-  	  	<property name="attribute-value-runtime-type">
+  <entity id="MyTag">
+  	<entity id="MyDualTypeAttr">
+  	  	<trait id="attribute-value-runtime-type">
   			<value>org.eclipse.jst.jsf.metadata.tests.NoImplType</value>
-  		</property>
-  		<property name="valid-values">
-  			<value>BFirstVal</value>
-  			<value>BSecondVal</value>
-  			<value>BThirdVal</value>
-  			<value>BFourthVal</value>
-  		</property>
-  		<property name="small-icon"><value>/icons/attr_val.gif</value></property>
-  	</cm-attribute>
-  </cm-element>
-</grammar-annotation>
+  		</trait>
+  		<trait id="valid-values">
+  			<value xsi:type="mdt:ListOfValues">
+	  			<item>BFirstVal</item>
+	  			<item>BSecondVal</item>
+	  			<item>BThirdVal</item>
+	  			<item>BFourthVal</item>
+	  		</value>
+  		</trait>
+  		<trait id="small-icon"><value>/icons/attr_val.gif</value></trait>
+  	</entity>
+  </entity>
+</md:metadatamodel>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.xml b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.xml
index 40a2dd5..a6708b3 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.xml
@@ -2,8 +2,8 @@
 <?eclipse version="3.0"?>
 <plugin>
    <extension
-         point="org.eclipse.jst.jsf.common.annotationFiles">
-      <annotationFile
+         point="org.eclipse.jst.jsf.common.standardMetaDataFiles">
+      <standardMetaDataFile
             location="/metadata/jsf_metadataprocessing2.xml"
             uri=" http://org.eclipse.jsf/metadataprocessing"/>
    </extension>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/src/org/eclipse/jst/jsf/metadataprocessingtests2/NoImplPossibleVals.java b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/src/org/eclipse/jst/jsf/metadataprocessingtests2/NoImplPossibleVals.java
index 2bc4723..c01a45a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/src/org/eclipse/jst/jsf/metadataprocessingtests2/NoImplPossibleVals.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/src/org/eclipse/jst/jsf/metadataprocessingtests2/NoImplPossibleVals.java
@@ -31,9 +31,10 @@
 	}
 
 	private List getPossibleVals() {
-		return CMAnnotationHelper.getCMAttributePropertyValues(getCMAnnotationContext().getBundleId(), getCMAnnotationContext().getUri(),
-				getCMAnnotationContext().getElementName(), getCMAnnotationContext().getAttributeName(),
-				IPossibleValues.POSSIBLE_VALUES_PROP_NAME);
+		return getTraitValueAsListOfStrings(IPossibleValues.POSSIBLE_VALUES_PROP_NAME);
+//		return CMAnnotationHelper.getCMAttributePropertyValues(getCMAnnotationContext().getBundleId(), getCMAnnotationContext().getUri(),
+//				getCMAnnotationContext().getElementName(), getCMAnnotationContext().getAttributeName(),
+//				IPossibleValues.POSSIBLE_VALUES_PROP_NAME);
 
 	}