Index: iknow-api/Models/EnrolledSemesters.cs
===================================================================
--- iknow-api/Models/EnrolledSemesters.cs	(revision aee2b88c7a15b0b0d323790d18c133b41446ff41)
+++ iknow-api/Models/EnrolledSemesters.cs	(revision ea405569ef29f56fbfc4d77708b6b3faf9286097)
@@ -14,6 +14,6 @@
         public string? Note { get; set; }
         public DateTime CratedAt { get; set; }
-        public DateTime LastChange { get; set; }
-        public DateTime Verified { get; set; }
+        public DateTime? LastChange { get; set; }
+        public DateTime? Verified { get; set; }
         public int SemesterId { get; set; }
         public ActiveSemesters? Semester { get; set; }
Index: iknow-api/Models/EnrollmentInfo.cs
===================================================================
--- iknow-api/Models/EnrollmentInfo.cs	(revision aee2b88c7a15b0b0d323790d18c133b41446ff41)
+++ 	(revision )
@@ -1,24 +1,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Net.Http.Headers;
-
-namespace iknow_api.Models
-{
-    public enum Quota
-    {
-        drzavna, privatna, stipendija
-    }
-    public class EnrollmentInfo
-    {
-        public int Id { get; set; }
-        public int EnrollmentYear { get; set; }
-        public Quota Quota { get; set; }
-        public int MajorId { get; set; }
-        public Major? Major { get; set; }
-        public int UserId { get; set; }
-        public User? User { get; set; }
-        public string? StudyType { get; set; }
-        public string? StudyStatus { get; set; }
-
-    }
-}
Index: iknow-api/Models/HighSchool.cs
===================================================================
--- iknow-api/Models/HighSchool.cs	(revision aee2b88c7a15b0b0d323790d18c133b41446ff41)
+++ iknow-api/Models/HighSchool.cs	(revision ea405569ef29f56fbfc4d77708b6b3faf9286097)
@@ -1,4 +1,2 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace iknow_api.Models
 {
@@ -7,4 +5,5 @@
         Strucen, Gimnazija
     }
+
     public class HighSchool
     {
@@ -14,5 +13,4 @@
         public int UserId { get; set; }
         public User? User { get; set; }
-        public string? StudyLanguage { get; set; }
     }
 }
Index: iknow-api/Models/MajorSubjects.cs
===================================================================
--- iknow-api/Models/MajorSubjects.cs	(revision aee2b88c7a15b0b0d323790d18c133b41446ff41)
+++ iknow-api/Models/MajorSubjects.cs	(revision ea405569ef29f56fbfc4d77708b6b3faf9286097)
@@ -6,5 +6,4 @@
         public int SubjectId { get; set; }
         public int MandatorySemester { get; set; }
-        public int Accreditation { get; set; }
         public Major? Majors { get; set; }
         public Subject? Subjects { get; set; }
Index: iknow-api/Models/Payment.cs
===================================================================
--- iknow-api/Models/Payment.cs	(revision aee2b88c7a15b0b0d323790d18c133b41446ff41)
+++ iknow-api/Models/Payment.cs	(revision ea405569ef29f56fbfc4d77708b6b3faf9286097)
@@ -10,4 +10,5 @@
         public User? User { get; set; }
         public int EnrollmentInfoId { get; set; }
+        public int Amount { get; set; }
         public EnrolledSemesters? EnrolledSemesters { get; set; }
 
Index: iknow-api/Models/Quota.cs
===================================================================
--- iknow-api/Models/Quota.cs	(revision ea405569ef29f56fbfc4d77708b6b3faf9286097)
+++ iknow-api/Models/Quota.cs	(revision ea405569ef29f56fbfc4d77708b6b3faf9286097)
@@ -0,0 +1,7 @@
+namespace iknow_api.Models
+{
+    public enum Quota
+    {
+        drzavna, privatna, stipendija
+    }
+}
Index: iknow-api/Models/SemesterSubjects.cs
===================================================================
--- iknow-api/Models/SemesterSubjects.cs	(revision aee2b88c7a15b0b0d323790d18c133b41446ff41)
+++ iknow-api/Models/SemesterSubjects.cs	(revision ea405569ef29f56fbfc4d77708b6b3faf9286097)
@@ -1,17 +1,18 @@
 namespace iknow_api.Models
 {
+    // The student is reached through EnrolledSemester.UserId; the ER model
+    // links SemestersSubjects to Users only through the professor.
     public class SemesterSubject
     {
-        public int Id { get; set; } 
-        
-        public int UserId { get; set; }                 
+        public int Id { get; set; }
+
         public int EnrolledSemesterId { get; set; }
         public int SubjectId { get; set; }
         public int ProfessorId { get; set; }
         public bool Signature { get; set; }
-        public User? User { get; set; }                 
+
         public EnrolledSemesters? EnrolledSemester { get; set; }
         public Subject? Subject { get; set; }
-        public User? Professor { get; set; }           
+        public User? Professor { get; set; }
         public PassedSubject? PassedSubject { get; set; }
     }
Index: iknow-api/Models/User.cs
===================================================================
--- iknow-api/Models/User.cs	(revision aee2b88c7a15b0b0d323790d18c133b41446ff41)
+++ iknow-api/Models/User.cs	(revision ea405569ef29f56fbfc4d77708b6b3faf9286097)
@@ -1,4 +1,2 @@
-
-
 namespace iknow_api.Models
 {
@@ -10,31 +8,32 @@
     }
 
+    // Attributes follow the Users entity in the ER model exactly.
     public class User
     {
-        internal object Payments;
-
         public int Id { get; set; }
         public string? Name { get; set; }
-        public string? EMBG {get; set; }
+        public string? EMBG { get; set; }
         public string? Surname { get; set; }
         public string? Index { get; set; }
         public string? Email { get; set; }
         public string? PasswordHash { get; set; }
-        public string? MiddleName { get; set; }
-        public string? Gender { get; set; }
-        public string? Nationality { get; set; }
-        public string? Citizenship { get; set; }
-        public DateTime Bday { get; set; }
+        public DateTime? Bday { get; set; }
         public DateTime CreatedAt { get; set; }
         public UserRole Role { get; set; }
+        public Quota? Quota { get; set; }
+        public int? EnrollmentYear { get; set; }
+
         public HighSchool? HighSchool { get; set; }
         public ContactInfo? ContactInfo { get; set; }
-        public EnrollmentInfo? EnrollmentInfo { get; set; }
         public ICollection<UserDocuments>? Documents { get; set; }
-        public ICollection<Payment>? EnrolledSemesters { get; set; }
-        public ICollection<SemesterSubject>? EnrolledSemesterUserSubjects { get; set; }
 
+        // Named for the relationship it carries: Users 1 --pays-- N Payment.
+        public ICollection<Payment>? Payments { get; set; }
+
+        // Users 1 --submits-- N EnrolledSemesters
+        public ICollection<EnrolledSemesters>? Enrolments { get; set; }
+
+        // Users 1 --teaches-- N SemestersSubjects
         public ICollection<SemesterSubject>? TeachingSubjects { get; set; }
-
     }
 }