diff --git a/core/migrations/0002_auto_20191115_2030.py b/core/migrations/0002_auto_20191115_2030.py
new file mode 100644
index 0000000000000000000000000000000000000000..1b420d2b5a17ece49c94cabcdac608680db5a4de
--- /dev/null
+++ b/core/migrations/0002_auto_20191115_2030.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.17 on 2019-11-15 13:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='feedback',
+            name='companyId',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Company'),
+        ),
+        migrations.AddField(
+            model_name='feedback',
+            name='studentId',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Student'),
+        ),
+    ]
diff --git a/core/models/feedbacks.py b/core/models/feedbacks.py
index c473ae82716b8c4a19526757c0bd09ab9a2c4363..1b9293b0fef4caaece30a40eb89911eb36cefe75 100755
--- a/core/models/feedbacks.py
+++ b/core/models/feedbacks.py
@@ -1,10 +1,12 @@
 from django.db import models
-
+from core.models.accounts import Student, Company
 
 class Feedback(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     title = models.CharField(max_length=100, blank=True, default='')
     content = models.TextField()
+    studentId = models.ForeignKey(Student, on_delete=models.CASCADE, null=True)
+    companyId = models.ForeignKey (Company, on_delete=models.CASCADE, null=True)
 
     class Meta:
         ordering = ['created']
diff --git a/core/serializers/feedbacks.py b/core/serializers/feedbacks.py
index 2558730792530d18a2199e96b4cba2d53f7ea0ee..59006181cd722db2546de95d6fdee221508b3ba6 100755
--- a/core/serializers/feedbacks.py
+++ b/core/serializers/feedbacks.py
@@ -6,4 +6,4 @@ from core.models.feedbacks import Feedback
 class FeedbackSerializer(serializers.ModelSerializer):
     class Meta:
         model = Feedback
-        fields = ['id', 'title', 'content']
+        fields = '__all__'