Working on model & description annotations.
diff --git a/core/api/src/main/java/org/onlab/onos/net/AbstractModel.java b/core/api/src/main/java/org/onlab/onos/net/AbstractModel.java
index 6bdda72..482ec68 100644
--- a/core/api/src/main/java/org/onlab/onos/net/AbstractModel.java
+++ b/core/api/src/main/java/org/onlab/onos/net/AbstractModel.java
@@ -2,8 +2,6 @@
 
 import org.onlab.onos.net.provider.ProviderId;
 
-import java.util.Map;
-
 /**
  * Base implementation of a network model entity.
  */
@@ -23,9 +21,7 @@
      * @param providerId  identity of the provider
      * @param annotations optional key/value annotations
      */
-    @SafeVarargs
-    protected AbstractModel(ProviderId providerId,
-                            Map<String, String>... annotations) {
+    protected AbstractModel(ProviderId providerId, Annotations... annotations) {
         super(annotations);
         this.providerId = providerId;
     }