diff --git a/exam/views.py b/exam/views.py
index 895cf7a..32a5156 100644
--- a/exam/views.py
+++ b/exam/views.py
@@ -44,7 +44,7 @@ class ViewExam(LoginRequiredMixin,generic.DetailView):
 
 
 
-class CreateExam(LoginRequiredMixin,HasRoleMixin,generic.CreateView):
+class CreateExam(LoginRequiredMixin,HasRoleMixin, NotificationMixin,generic.CreateView):
 
 	allowed_roles = ['professor', 'system_admin']
 	login_url = reverse_lazy("core:home")
@@ -72,8 +72,12 @@ class CreateExam(LoginRequiredMixin,HasRoleMixin,generic.CreateView):
 		self.object = form.save(commit = False)
 		topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
 		self.object.topic = topic
+		self.object.name = str(self.object)
 		self.object.save()
 
+		super(CreateExam, self).createNotification(message="created an Exam "+ self.object.name, actor=self.request.user,
+			resource_name=self.object.name, resource_link= reverse('course:exam:view_exam', args=[self.object.slug]), 
+			users=self.object.topic.subject.students.all())
 		for key in self.request.POST:
 			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'begin_date' and key != 'limit_date' and key != 'all_students' and key != 'students'):
 				answer = Answer(answer=self.request.POST[key],order=key,exam=self.object)
diff --git a/files/views.py b/files/views.py
index 9bf463d..83dc96d 100644
--- a/files/views.py
+++ b/files/views.py
@@ -11,9 +11,10 @@ from .models import TopicFile
 from .utils import mime_type_to_material_icons
 from courses.models import Topic
 from core.models import MimeType
+from core.mixins import NotificationMixin
 
 # Create your views here.
-class CreateFile(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
+class CreateFile(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.edit.CreateView):
 	allowed_roles = ['professor', 'system_admin']
 	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
@@ -32,6 +33,10 @@ class CreateFile(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
 		self.object = form.save(commit = False)
 		topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
 		self.object.topic = topic
+		
+		self.object.name = str(self.object)
+		
+
 		# Set MimeType
 		file = self.request.FILES['file_url']
 		try:
@@ -54,6 +59,10 @@ class CreateFile(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
 			# self.object.file_type = MimeType.objects.get(id = 1)
 
 		self.object.save()
+		#CREATE NOTIFICATION
+		super(CreateFile, self).createNotification(message="uploaded a File "+ self.object.name, actor=self.request.user,
+			resource_name=self.object.name, resource_link= reverse('course:file:create_file', args=[self.object.slug]), 
+			users=self.object.topic.subject.students.all())
 
 		return self.get_success_url()
 
--
libgit2 0.21.2