diff --git a/src/main/java/org/apache/cassandra/metrics/StorageMetrics.java b/src/main/java/org/apache/cassandra/metrics/StorageMetrics.java
new file mode 100644
index 0000000..7a2759d
--- /dev/null
+++ b/src/main/java/org/apache/cassandra/metrics/StorageMetrics.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+/*
+ * Copyright 2015 Cloudius Systems
+ *
+ * Modified by Cloudius Systems
+ */
+package org.apache.cassandra.metrics;
+
+import com.cloudius.urchin.metrics.APIMetrics;
+import com.cloudius.urchin.metrics.DefaultNameFactory;
+import com.cloudius.urchin.metrics.MetricNameFactory;
+import com.yammer.metrics.core.Counter;
+
+/**
+ * Metrics related to Storage.
+ */
+public class StorageMetrics {
+    private static final MetricNameFactory factory = new DefaultNameFactory(
+            "Storage");
+
+    public static final Counter load = APIMetrics.newCounter(
+            "/storage_service/metrics/load", factory.createMetricName("Load"));
+    public static final Counter exceptions = APIMetrics.newCounter(
+            "/storage_service/metrics/exceptions",
+            factory.createMetricName("Exceptions"));
+    public static final Counter totalHintsInProgress = APIMetrics.newCounter(
+            "/storage_service/metrics/hints_in_progress",
+            factory.createMetricName("TotalHintsInProgress"));
+    public static final Counter totalHints = APIMetrics.newCounter(
+            "/storage_service/metrics/total_hints",
+            factory.createMetricName("TotalHints"));
+}
diff --git a/src/main/java/org/apache/cassandra/service/StorageService.java b/src/main/java/org/apache/cassandra/service/StorageService.java
index 20e731f..867e4cf 100644
--- a/src/main/java/org/apache/cassandra/service/StorageService.java
+++ b/src/main/java/org/apache/cassandra/service/StorageService.java
@@ -34,6 +34,7 @@ import javax.management.*;
 import javax.management.openmbean.TabularData;
 import javax.ws.rs.core.MultivaluedMap;
 
+import org.apache.cassandra.metrics.StorageMetrics;
 import org.apache.cassandra.repair.RepairParallelism;
 
 import com.cloudius.urchin.api.APIClient;
@@ -50,7 +51,9 @@ public class StorageService extends NotificationBroadcasterSupport implements
             .getLogger(StorageService.class.getName());
 
     private APIClient c = new APIClient();
-
+    
+    private StorageMetrics metrics = new StorageMetrics();
+    
     public static final StorageService instance = new StorageService();
 
     public static StorageService getInstance() {