diff --git a/drivers/corsa/BUCK b/drivers/corsa/BUCK
index 73a2549..f2f30d7 100644
--- a/drivers/corsa/BUCK
+++ b/drivers/corsa/BUCK
@@ -1,6 +1,7 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:openflowj',
+    '//drivers/default:onos-drivers-default',
     '//drivers/utilities:onos-drivers-utilities',
     '//protocols/openflow/api:onos-protocols-openflow-api',
 ]
diff --git a/drivers/corsa/pom.xml b/drivers/corsa/pom.xml
index 74728ce..4e91f28 100644
--- a/drivers/corsa/pom.xml
+++ b/drivers/corsa/pom.xml
@@ -50,6 +50,11 @@
             <groupId>org.onosproject</groupId>
             <artifactId>openflowj</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-drivers</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaFullVlanAvailable.java b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaFullVlanAvailable.java
new file mode 100644
index 0000000..a7e9b8c
--- /dev/null
+++ b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaFullVlanAvailable.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.drivers.corsa;
+
+import com.google.common.annotations.Beta;
+import org.onosproject.driver.query.FullVlanAvailable;
+
+/**
+ * Driver which always responds that all VLAN IDs are available for the Device.
+ *
+ * FIXME
+ * To avoid CorsaFullVlanAvailable.
+ *
+ * OSGi: help bundle plugin discover runtime package dependency.
+ * <pre>
+ * <code>
+ *  Remember to add the tag: SuppressWarnings("unused")
+ *  private FullVlanAvailable fullVlans;
+ * </code>
+ * </pre>
+ */
+
+
+@Beta
+public class CorsaFullVlanAvailable extends FullVlanAvailable {
+
+}
diff --git a/drivers/corsa/src/main/resources/corsa-drivers.xml b/drivers/corsa/src/main/resources/corsa-drivers.xml
index 8f4c335..4aa54ad 100644
--- a/drivers/corsa/src/main/resources/corsa-drivers.xml
+++ b/drivers/corsa/src/main/resources/corsa-drivers.xml
@@ -47,5 +47,7 @@
                    impl="org.onosproject.drivers.corsa.CorsaPipelineV39"/>
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.drivers.corsa.CorsaSwitchHandshaker"/>
+        <behaviour api="org.onosproject.net.behaviour.VlanQuery"
+                   impl="org.onosproject.drivers.corsa.CorsaFullVlanAvailable"/>
     </driver>
 </drivers>
\ No newline at end of file