initial impl of criteria
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java
index 348c30f..da86e13 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java
@@ -1,6 +1,7 @@
 package org.onlab.onos.net.flow.instructions;
 
 import org.onlab.packet.MACAddress;
+import org.onlab.packet.VLANID;
 
 /**
  * Abstraction of a single traffic treatment step.
@@ -100,9 +101,9 @@
      */
     public static final class ModVlanIdInstruction extends L2ModificationInstruction {
 
-        public final Short vlanId;
+        public final VLANID vlanId;
 
-        public ModVlanIdInstruction(Short vlanId) {
+        public ModVlanIdInstruction(VLANID vlanId) {
             this.vlanId = vlanId;
         }
 
@@ -111,7 +112,7 @@
             return L2SubType.VLAN_ID;
         }
 
-        public Short vlanId() {
+        public VLANID vlanId() {
             return this.vlanId;
         }