diff --git a/core/decorators.py b/core/decorators.py
index ad66922..63d1e53 100644
--- a/core/decorators.py
+++ b/core/decorators.py
@@ -38,7 +38,8 @@ def log_decorator(log_component = '', log_action = '', log_resource = ''):
 				log = Log()
 				log.user = request.user
 				log.component = log_component
-				log.context = json.dumps(request.log_context)
+				#log.context = json.dumps(request.log_context)
+				log.context = request.log_context
 				log.action_resource = action_resource
 
 				log.save()
diff --git a/core/middleware.py b/core/middleware.py
index e5e3ccc..9c2b30a 100644
--- a/core/middleware.py
+++ b/core/middleware.py
@@ -26,13 +26,16 @@ class TimeSpentMiddleware(object):
 				secs = secs % 60
 
 				log_context = json.loads(log.context)
+				print(log.context)
 
-				log_context['time_spent'] = {}
-				log_context['time_spent']['hours'] = hours
-				log_context['time_spent']['minutes'] = minutes
-				log_context['time_spent']['seconds'] = secs
+				time = {}
+				time['hours'] = hours
+				time['minutes'] = minutes
+				time['seconds'] = secs
 
-				log.context = json.dumps(log_context)
+				log_context['time_spent'] = time
+				
+				log.context = log_context
 
 				log.save()
 
diff --git a/core/mixins.py b/core/mixins.py
index 57214e9..c812024 100644
--- a/core/mixins.py
+++ b/core/mixins.py
@@ -36,7 +36,8 @@ class LogMixin(object):
 
 		log = Log()
 		log.user = actor
-		log.context = json.dumps(context)
+		#log.context = json.dumps(context)
+		log.context = context
 		log.component = component
 		log.action_resource = action_resource
 
diff --git a/core/models.py b/core/models.py
index dba12f0..a3867e8 100644
--- a/core/models.py
+++ b/core/models.py
@@ -2,6 +2,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from users.models import User
 from autoslug.fields import AutoSlugField
+from django.contrib.postgres.fields import JSONField
 # Create your models here.
 
 class MimeType(models.Model):
@@ -102,7 +103,7 @@ class Notification(models.Model):
 
 class Log(models.Model):
     component = models.TextField(_('Component (Module / App)'))
-    context = models.TextField(_('Context'), blank = True)
+    context = JSONField(_('Context'), blank = True)
     action_resource = models.ForeignKey(Action_Resource, verbose_name = _('Action_Resource'))
     user = models.ForeignKey(User, verbose_name = _('Actor'))
     datetime = models.DateTimeField(_("Date and Time of action"), auto_now_add = True)
diff --git a/core/views.py b/core/views.py
index 5499b19..0c2782c 100644
--- a/core/views.py
+++ b/core/views.py
@@ -20,7 +20,6 @@ from rest_framework import status, serializers, permissions, viewsets
 from rest_framework.response import Response
 from rest_framework.decorators import api_view
 
-
 from .forms import RegisterUserForm
 from .decorators import log_decorator, notification_decorator
 
--
libgit2 0.21.2