diff --git a/core/AmSessionContainer.cpp b/core/AmSessionContainer.cpp
index f18c9651..1f5248e1 100644
--- a/core/AmSessionContainer.cpp
+++ b/core/AmSessionContainer.cpp
@@ -45,7 +45,7 @@ _MONITORING_DECLARE_INTERFACE(AmSessionContainer);
 
 AmSessionContainer::AmSessionContainer()
   : _run_cond(false), _container_closed(false), enable_unclean_shutdown(false),
-    CPSLimit(0), CPSHardLimit(0), max_cps(0)
+    CPSLimit(0), CPSHardLimit(0), max_cps(0), cps_samplerate(5)
 {
 }
 
@@ -399,14 +399,14 @@ void AmSessionContainer::setCPSSoftLimit(unsigned int percent)
 
   while (cps_queue.size()) {
     timersub(&tv, &cps_queue.front(), &res);
-    if (res.tv_sec >= CPS_SAMPLERATE) {
+    if (res.tv_sec >= cps_samplerate) {
       cps_queue.pop();
     }   
     else {
       break;
     }
   }
-  CPSLimit = ((float)percent / 100) * ((float)cps_queue.size() / CPS_SAMPLERATE);
+  CPSLimit = (static_cast<float>(percent) / 100) * (static_cast<float>(cps_queue.size()) / cps_samplerate);
   if(0 == CPSLimit) CPSLimit = 1;
 }
 
@@ -425,7 +425,7 @@ unsigned int AmSessionContainer::getAvgCPS()
 
   while (cps_queue.size()) {
     timersub(&tv, &cps_queue.front(), &res);
-    if (res.tv_sec >= CPS_SAMPLERATE) {
+    if (res.tv_sec >= cps_samplerate) {
       cps_queue.pop();
     }   
     else {
@@ -433,7 +433,7 @@ unsigned int AmSessionContainer::getAvgCPS()
     }
   }
 
-  return (float)cps_queue.size() / CPS_SAMPLERATE;
+  return static_cast<float>(cps_queue.size()) / cps_samplerate;
 }
 
 unsigned int AmSessionContainer::getMaxCPS()
@@ -465,7 +465,7 @@ bool AmSessionContainer::check_and_add_cps(bool emergency_flag)
 
   while (cps_queue.size()) {
     timersub(&tv, &cps_queue.front(), &res);
-    if (res.tv_sec >= CPS_SAMPLERATE) {
+    if (res.tv_sec >= cps_samplerate) {
       cps_queue.pop();
     }   
     else {
@@ -473,7 +473,7 @@ bool AmSessionContainer::check_and_add_cps(bool emergency_flag)
     }
   }
 
-  unsigned int cps = (float)cps_queue.size() / CPS_SAMPLERATE;
+  unsigned int cps = static_cast<float>(cps_queue.size()) / cps_samplerate;
   if (cps > max_cps) {
     max_cps = cps;
   }
diff --git a/core/AmSessionContainer.h b/core/AmSessionContainer.h
index 514c14cf..c6b73769 100644
--- a/core/AmSessionContainer.h
+++ b/core/AmSessionContainer.h
@@ -93,7 +93,7 @@ class AmSessionContainer : public AmThread
   /** Mutex to protect the cps container */
   AmMutex      cps_mut;
 
-  enum { CPS_SAMPLERATE = 5 };
+  const float cps_samplerate;
 
   unsigned int CPSLimit;
   unsigned int CPSHardLimit;
@@ -197,7 +197,7 @@ class AmSessionContainer : public AmThread
   pair<unsigned int, unsigned int> getCPSLimit();
 
   /**
-   * Gets the timeaverage of calls per second in the last CPS_SAMPLERATE sec window
+   * Gets the timeaverage of calls per second in the last cps_samplerate sec window
    */
   unsigned int getAvgCPS();
   /**