Index: backend/subjects/management/data/additional_info.json
===================================================================
--- backend/subjects/management/data/additional_info.json	(revision 9708984b19ad37db34215453d43250d5f3ff476c)
+++ backend/subjects/management/data/additional_info.json	(revision 600bd934457e62550bf0937f650e8d7471fe5657)
@@ -51,5 +51,6 @@
 		"name": "Е-учење",
 		"tags": ["Education", "Societal Skills"],
-		"isEasy": "yes"
+		"isEasy": "yes",
+		"evaluation": ["Theory", "Project"]
 	},
 	{
@@ -189,5 +190,6 @@
 		"name": "Вовед во екоинформатиката",
 		"tags": ["Data Science", "Computer Science", "Societal Skills"],
-		"isEasy": "yes"
+		"isEasy": "yes",
+		"evaluation": ["Theory", "Project"]
 	},
 	{
@@ -231,5 +233,6 @@
 	{
 		"name": "Електрични кола",
-		"tags": ["Computer Architecture", "Physics"]
+		"tags": ["Computer Architecture", "Physics"],
+		"evaluation": ["Practical"]
 	},
 	{
@@ -379,5 +382,6 @@
 			"Computer Architecture",
 			"Software Engineering"
-		]
+		],
+		"evaluation": ["Theory + Practical", "Project"]
 	},
 	{
@@ -394,5 +398,6 @@
 	{
 		"name": "Виртуелизација",
-		"tags": ["Cloud Engineering & DevOps", "Systems Infrastructure"]
+		"tags": ["Cloud Engineering & DevOps", "Systems Infrastructure"],
+		"evaluation": ["Theory + Practical", "Project"]
 	},
 	{
@@ -503,5 +508,7 @@
 	{
 		"name": "Компјутерска етика",
-		"tags": ["Societal Skills", "Computer Science"],
+		"tags": ["Societal Skills", "Education"],
+		"technologies": [],
+		"evaluation": ["Theory", "Project"],
 		"isEasy": "yes"
 	},
Index: backend/subjects/management/data/subject_details.json
===================================================================
--- backend/subjects/management/data/subject_details.json	(revision 9708984b19ad37db34215453d43250d5f3ff476c)
+++ backend/subjects/management/data/subject_details.json	(revision 600bd934457e62550bf0937f650e8d7471fe5657)
@@ -227,5 +227,5 @@
 		"tags": ["Education", "Societal Skills"],
 		"technologies": [],
-		"evaluation": [],
+		"evaluation": ["Theory", "Project"],
 		"isEasy": true
 	},
@@ -799,5 +799,5 @@
 		"tags": ["Data Science", "Computer Science", "Societal Skills"],
 		"technologies": [],
-		"evaluation": [],
+		"evaluation": ["Theory", "Project"],
 		"isEasy": true
 	},
@@ -970,5 +970,5 @@
 		"tags": ["Computer Architecture", "Physics"],
 		"technologies": [],
-		"evaluation": [],
+		"evaluation": ["Practical"],
 		"isEasy": false
 	},
@@ -1619,5 +1619,5 @@
 		],
 		"technologies": [],
-		"evaluation": [],
+		"evaluation": ["Theory + Practical", "Project"],
 		"isEasy": false
 	},
@@ -1704,5 +1704,5 @@
 		"tags": ["Cloud Engineering & DevOps", "Systems Infrastructure"],
 		"technologies": [],
-		"evaluation": [],
+		"evaluation": ["Theory + Practical", "Project"],
 		"isEasy": false
 	},
@@ -2090,7 +2090,7 @@
 		"professors": ["Бојан Илијоски", "Катерина Здравкова"],
 		"assistants": [],
-		"tags": ["Societal Skills", "Computer Science"],
-		"technologies": [],
-		"evaluation": [],
+		"tags": ["Societal Skills", "Education"],
+		"technologies": [],
+		"evaluation": ["Theory", "Project"],
 		"isEasy": true
 	},