diff --git a/exam/admin.py b/exam/admin.py
index af11ccd..004f01e 100644
--- a/exam/admin.py
+++ b/exam/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import Exam, Answer, AnswersStudent
+from .models import Exam, Answer, AnswersStudent, Question, Alternative
 
 class ExamAdmin(admin.ModelAdmin):
 	list_display = ['name', 'slug','begin_date','limit_date']
@@ -17,3 +17,5 @@ class AnswersStudentAdmin(admin.ModelAdmin):
 admin.site.register(Exam, ExamAdmin)
 admin.site.register(Answer, AnswerAdmin)
 admin.site.register(AnswersStudent, AnswersStudentAdmin)
+admin.site.register(Question)
+admin.site.register(Alternative)
diff --git a/exam/forms.py b/exam/forms.py
index 7d3e5df..60b98ad 100644
--- a/exam/forms.py
+++ b/exam/forms.py
@@ -25,7 +25,7 @@ class ExamForm(forms.ModelForm):
 
     class Meta:
         model = Exam
-        fields = ['name','begin_date','limit_date','students','all_students']
+        fields = ['name','begin_date','limit_date','students','all_students', 'begin_exam', 'end_exam']
 
         widgets = {
             'name': forms.TextInput(attrs={'placeholder': 'Exam?'}),
diff --git a/exam/models.py b/exam/models.py
index b93b11f..ccde810 100644
--- a/exam/models.py
+++ b/exam/models.py
@@ -45,3 +45,12 @@ class AnswersStudent(models.Model):
 
     def __str__(self):
         return str(self.student) + str("/") + str(self.exam)
+
+class Question(models.Model):
+    exam = models.ForeignKey(Exam, verbose_name=_('Exam'), related_name='question_exam')
+    statement = models.TextField(_("Statement"), blank=False)
+
+class Alternative(models.Model):
+    question = models.ForeignKey(Question, verbose_name=_("Question"), related_name="alternative_question")
+    statement = models.TextField(_("Statement"), blank=False)
+    answer = models.BooleanField(_("answer"), default=False)
\ No newline at end of file
--
libgit2 0.21.2