diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java
index 263ca54e85f..ed62bb57b6d 100644
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@ -27,8 +27,8 @@ public interface Network extends ControlledEntity {
         public static final Service Dhcp = new Service("Dhcp");
         public static final Service Dns = new Service("Dns");
         public static final Service Gateway = new Service("Gateway");
-        public static final Service Firewall = new Service("Firewall", Capability.PortForwarding, Capability.StaticNat, Capability.SupportedProtocols, Capability.MultipleIps, Capability.SupportedSourceNatTypes);
-        public static final Service Lb = new Service("Lb", Capability.SupportedLBAlgorithms, Capability.SupportedProtocols);
+        public static final Service Firewall = new Service("Firewall", Capability.PortForwarding, Capability.StaticNat, Capability.SupportedProtocols, Capability.MultipleIps, Capability.SupportedSourceNatTypes, Capability.TrafficStatistics);
+        public static final Service Lb = new Service("Lb", Capability.SupportedLBAlgorithms, Capability.SupportedProtocols, Capability.TrafficStatistics);
         public static final Service UserData = new Service("UserData");
         
         private String name;
@@ -90,6 +90,7 @@ public interface Network extends ControlledEntity {
         public static final Capability MultipleIps = new Capability("MultipleIps");
         public static final Capability SupportedSourceNatTypes = new Capability("SupportedSourceNatTypes");
         public static final Capability SupportedVpnTypes = new Capability("SupportedVpnTypes");
+        public static final Capability TrafficStatistics = new Capability("TrafficStatistics");
         
         private String name;
         
diff --git a/server/src/com/cloud/network/element/DhcpElement.java b/server/src/com/cloud/network/element/DhcpElement.java
index 30f5805a663..b5a123ec3b2 100644
--- a/server/src/com/cloud/network/element/DhcpElement.java
+++ b/server/src/com/cloud/network/element/DhcpElement.java
@@ -143,7 +143,6 @@ public class DhcpElement extends AdapterBase implements NetworkElement{
         capabilities.put(Service.Dns, null);
         capabilities.put(Service.UserData, null);
         capabilities.put(Service.Dhcp, null);
-        capabilities.put(Service.Gateway, null);
         
         return capabilities;
     }
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index 7c7819b2acc..3a2a01e66c7 100644
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -204,6 +204,7 @@ public class VirtualRouterElement extends AdapterBase implements NetworkElement
         //Set capabilities for Firewall service
         Map<Capability, String> firewallCapabilities = new HashMap<Capability, String>();
         firewallCapabilities.put(Capability.PortForwarding, "true");
+        firewallCapabilities.put(Capability.TrafficStatistics, "per public ip");
         firewallCapabilities.put(Capability.StaticNat, "true");
         firewallCapabilities.put(Capability.SupportedProtocols, "tcp,udp");
         firewallCapabilities.put(Capability.MultipleIps, "true");