diff --git a/core/api/src/main/java/org/onosproject/net/MarkerResource.java b/core/api/src/main/java/org/onosproject/net/MarkerResource.java
new file mode 100644
index 0000000..fb7b594
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/net/MarkerResource.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2017-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.net;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * MarkerResource to add hints about installable Intent.
+ */
+public final class MarkerResource implements NetworkResource {
+    private final String mark;
+
+    private MarkerResource(String mark) {
+        this.mark = checkNotNull(mark);
+    }
+
+    /**
+     * Creates an instance of MarkerResource.
+     *
+     * @param mark marker String
+     * @return MarkerResource
+     */
+    public static MarkerResource marker(String mark) {
+        return new MarkerResource(mark);
+    }
+
+    @Override
+    public int hashCode() {
+        return mark.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof MarkerResource) {
+            return mark.equals(((MarkerResource) obj).mark);
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return mark;
+    }
+
+
+    private MarkerResource() {
+        this.mark = "";
+    }
+}
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index c0382b7..3480b41 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -74,6 +74,7 @@
 import org.onosproject.net.HostLocation;
 import org.onosproject.net.Link;
 import org.onosproject.net.LinkKey;
+import org.onosproject.net.MarkerResource;
 import org.onosproject.net.OchPort;
 import org.onosproject.net.OchSignal;
 import org.onosproject.net.OchSignalType;
@@ -561,6 +562,7 @@
             .register(ProtectedTransportEndpointDescription.class)
             .register(ProtectionEndpointIntent.class)
             .register(ProtectedTransportIntent.class)
+            .register(MarkerResource.class)
             .build("API");
 
     /**
diff --git a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
index dedadaa..dc45570 100644
--- a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
+++ b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
@@ -46,6 +46,7 @@
 import org.onosproject.net.HostLocation;
 import org.onosproject.net.Link;
 import org.onosproject.net.LinkKey;
+import org.onosproject.net.MarkerResource;
 import org.onosproject.net.OchPort;
 import org.onosproject.net.OchSignal;
 import org.onosproject.net.OduCltPort;
@@ -415,6 +416,11 @@
     }
 
     @Test
+    public void testMarkerResource() {
+        testSerializedEquals(MarkerResource.marker("testString"));
+    }
+
+    @Test
     public void testAnnotations() {
         // Annotations does not have equals defined, manually test equality
         final byte[] a1Bytes = serializer.encode(A1);
