diff --git a/stacktach/views.py b/stacktach/views.py
index a1a1a6b..9e2b8c5 100644
--- a/stacktach/views.py
+++ b/stacktach/views.py
@@ -366,6 +366,9 @@ def process_raw_data(deployment, args, json_args):
         STACKDB.save(record)
     return record
 
+def post_process(raw, body):
+    aggregate_lifecycle(raw)
+    aggregate_usage(raw, body)
 
 def _post_process_raw_data(rows, highlight=None):
     for row in rows:
diff --git a/worker/worker.py b/worker/worker.py
index 18dfdb3..db05257 100644
--- a/worker/worker.py
+++ b/worker/worker.py
@@ -92,9 +92,7 @@ class NovaConsumer(kombu.mixins.ConsumerMixin):
         if raw:
             self.processed += 1
             message.ack()
-
-        views.aggregate_lifecycle(raw)
-        views.aggregate_usage(raw, args[1])
+            views.post_process(raw, args[1])
 
         self._check_memory()