Index: backend/subjects/management/commands/abstract.py
===================================================================
--- backend/subjects/management/commands/abstract.py	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/commands/abstract.py	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -41,5 +41,4 @@
             abstracts[name] = abstract
             self.stdout.write(self.style.SUCCESS(f"Scraped {name}."))
-            break
 
         with open(output_file_path, "w", encoding='utf-8') as f:
Index: backend/subjects/management/commands/elective.py
===================================================================
--- backend/subjects/management/commands/elective.py	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/commands/elective.py	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -62,5 +62,4 @@
                             if subject_text == "F23L1S066 Основи на сајбер безбедноста": subject_text = "Основи на сајбер безбедноста"
                             if subject_text == "Автоматизирање на процеси во  машинско учење": subject_text = "Автоматизирање на процеси во машинско учење"
-
                             subjects[subject_text] = {}
                             subjects[subject_text]["subject"] = subject_text
@@ -81,5 +80,7 @@
                 table_index += 1
 
-            if semesters_dict:  
+            if semesters_dict:
+                if program_name == 'SIIS23':
+                    del semesters_dict['W']['Веројатност и статистика']  
                 programs_dict[program_name] = semesters_dict
             
Index: backend/subjects/management/commands/fill_db.py
===================================================================
--- backend/subjects/management/commands/fill_db.py	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/commands/fill_db.py	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -35,4 +35,5 @@
         subjects = []
         for item in subject_details.values():
+            # only get the 23 accreditation code
             code = item["code"] if "," not in item["code"] else item["code"].split(",")[1].strip()
             subject = Subject(
Index: backend/subjects/management/commands/subject_details.py
===================================================================
--- backend/subjects/management/commands/subject_details.py	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/commands/subject_details.py	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -134,9 +134,11 @@
                 if subject in elective_data[program][WINTER]:
                     subject_data[subject]['season'] = WINTER
-                    subject_data[subject]['semester'] = elective_data[program][WINTER][subject]['semester']
+                    if 'semester' not in subject_data[subject]:
+                        subject_data[subject]['semester'] = elective_data[program][WINTER][subject]['semester']
                     subject_data[subject]['electiveFor'].append(program)
                 elif subject in elective_data[program][SUMMER]:
                     subject_data[subject]['season'] = SUMMER
-                    subject_data[subject]['semester'] = elective_data[program][SUMMER][subject]['semester']
+                    if 'semester' not in subject_data[subject]:
+                        subject_data[subject]['semester'] = elective_data[program][SUMMER][subject]['semester']
                     subject_data[subject]['electiveFor'].append(program)
         
@@ -177,6 +179,5 @@
                     subject_data[name]["evaluation"] = []            
 
-                subject_data[name]["isEasy"] = True if "isEasy" in course else False
-
+                subject_data[name]["isEasy"] = course["isEasy"]
             else:
                 if with_warnings:
Index: backend/subjects/management/commands/subjects_by_program.py
===================================================================
--- backend/subjects/management/commands/subjects_by_program.py	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/commands/subjects_by_program.py	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -10,5 +10,5 @@
         file_path = base_dir / 'data' / 'mandatory.json'
 
-        output_path = base_dir / 'data' / 'subjects_by_program1.json'
+        output_path = base_dir / 'data' / 'subjects_by_program.json'
 
         try:
Index: backend/subjects/management/data/abstracts.json
===================================================================
--- backend/subjects/management/data/abstracts.json	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/data/abstracts.json	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -151,5 +151,5 @@
 	"Операциони истражувања": "Да го запознае студентот со областа на проблеми и методи на операциони истражувања, проблеми на оптимизација на ресурси и проекти и оптимално управување, со методи и техники на линеарно и нелинеарно програмирање, теории на одлучување и игри, операциони истражувања поврзани со управувaчки информациски системи и информациски системи за подршка на одлучување и предвидување.",
 	"Оптички мрежи": "Студентот ќе се стекне со основни познавања за дизајн, контрола и управување на оптички мрежи со помош на современите мрежни технологии, како и со некои тековни развои во областа.",
-	"Пресметковна биологија": "",
+	"Пресметковна биологија": "Студентот ќе се стекне со основни познавања за дизајн, контрола и управување на оптички мрежи со помош на современите мрежни технологии, како и со некои тековни развои во областа.",
 	"Пресметување во облак": "Овој предмет ќе го оспособи студентот со основни познавања за концептот на облак и услуги во облак.",
 	"Претприемништво": "Студентите ќе бидат запознаени со предизвиците со кои ќе се соочат доколку се решат да започнат сопствен бизнис. Тие ќе можат да изработат иницијално истражување на пазарот, да ги дефинираат метриките со кои ќе ја следат успеноста на својот бизнис, како и да знаат како да препознаат дали обезбедиле вредност за своите клиенти. Конечно, тие ќе бидат оспособени да се претстават пред потенцијални клиенти, партнери и инвеститори.",
Index: backend/subjects/management/data/additional_info.json
===================================================================
--- backend/subjects/management/data/additional_info.json	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/data/additional_info.json	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -4,5 +4,6 @@
 		"tags": ["Computer Architecture", "Systems Infrastructure"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -10,5 +11,5 @@
 		"tags": ["Societal Skills"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -17,5 +18,6 @@
 		"tags": ["Data Science", "Mathematics"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -23,10 +25,13 @@
 		"tags": ["Computer Science"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
 		"name": "Дизајн на дигитални кола",
 		"tags": ["Computer Architecture", "Embedded Systems"],
-		"technologies": []
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -34,5 +39,6 @@
 		"tags": ["Mathematics", "Computer Science"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -40,5 +46,6 @@
 		"tags": ["Mathematics", "Computer Science"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -46,10 +53,12 @@
 		"tags": ["Mathematics", "Computer Science"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
 		"name": "Е-учење",
 		"tags": ["Education", "Societal Skills"],
-		"isEasy": "yes",
+		"technologies": [],
+		"isEasy": true,
 		"evaluation": ["Theory", "Project"]
 	},
@@ -58,5 +67,6 @@
 		"tags": ["Mathematics", "Computer Science"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -64,5 +74,6 @@
 		"tags": ["Mathematics", "Computer Science"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -70,5 +81,6 @@
 		"tags": ["Mathematics", "Computer Science"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -76,5 +88,6 @@
 		"tags": ["Computer Architecture"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -82,5 +95,5 @@
 		"tags": ["Computer Architecture", "Embedded Systems"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -89,5 +102,5 @@
 		"tags": ["Societal Skills"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -96,5 +109,5 @@
 		"tags": ["Societal Skills"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -103,5 +116,6 @@
 		"tags": ["Software Engineering"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -109,5 +123,6 @@
 		"tags": ["Software Engineering", "Computer Science"],
 		"technologies": ["C++"],
-		"evaluation": ["Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -115,5 +130,6 @@
 		"tags": ["Web Development", "UI/UX & Digital Media"],
 		"technologies": ["HTML", "CSS"],
-		"evaluation": ["Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -121,6 +137,6 @@
 		"tags": ["Cybersecurity", "Networking"],
 		"technologies": [],
-		"evaluation": ["Theory"],
-		"isEasy": "yes"
+		"isEasy": true,
+		"evaluation": ["Theory"]
 	},
 	{
@@ -128,5 +144,5 @@
 		"tags": ["Education", "Societal Skills"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -135,5 +151,5 @@
 		"tags": ["Societal Skills"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Project"]
 	},
@@ -142,5 +158,6 @@
 		"tags": ["Software Engineering", "Computer Science"],
 		"technologies": ["C++"],
-		"evaluation": ["Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -148,5 +165,6 @@
 		"tags": ["Physics"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -154,5 +172,6 @@
 		"tags": ["Computer Science", "Software Engineering"],
 		"technologies": ["Java"],
-		"evaluation": ["Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -160,5 +179,5 @@
 		"tags": ["Software Engineering", "Societal Skills"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory", "Project"]
 	},
@@ -167,5 +186,6 @@
 		"tags": ["Networking", "Cybersecurity", "Embedded Systems"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -173,5 +193,6 @@
 		"tags": ["Mathematics", "Data Science", "Computer Science"],
 		"technologies": ["R"],
-		"evaluation": ["Theory + Practical", "Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Code"]
 	},
 	{
@@ -179,5 +200,6 @@
 		"tags": ["AI / ML", "Computer Science"],
 		"technologies": ["Python"],
-		"evaluation": ["Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -185,4 +207,5 @@
 		"tags": ["Software Engineering", "UI/UX & Digital Media"],
 		"technologies": [".NET"],
+		"isEasy": false,
 		"evaluation": ["Code", "Project"]
 	},
@@ -190,5 +213,6 @@
 		"name": "Вовед во екоинформатиката",
 		"tags": ["Data Science", "Computer Science", "Societal Skills"],
-		"isEasy": "yes",
+		"technologies": [],
+		"isEasy": true,
 		"evaluation": ["Theory", "Project"]
 	},
@@ -196,5 +220,7 @@
 		"name": "Вовед во случајни процеси",
 		"tags": ["Mathematics", "Data Science", "Computer Science"],
-		"evaluation": ["Theory + Practical"]
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -202,6 +228,6 @@
 		"tags": ["Multimedia", "AI / ML", "Data Science", "Computer Science"],
 		"technologies": ["Python"],
-		"evaluation": ["Theory + Code", "Project"],
-		"isEasy": "yes"
+		"isEasy": true,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -209,5 +235,5 @@
 		"tags": ["Multimedia"],
 		"technologies": ["Blender"],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory", "Project"]
 	},
@@ -216,10 +242,12 @@
 		"tags": ["Computer Science", "Software Engineering", "Mathematics"],
 		"technologies": ["any"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
 		"name": "Е-влада",
 		"tags": ["Societal Skills"],
-		"isEasy": "yes",
+		"technologies": [],
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -228,5 +256,5 @@
 		"tags": ["Societal Skills"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -234,4 +262,6 @@
 		"name": "Електрични кола",
 		"tags": ["Computer Architecture", "Physics"],
+		"technologies": [],
+		"isEasy": false,
 		"evaluation": ["Practical"]
 	},
@@ -239,5 +269,7 @@
 		"name": "Информатичко размислување во образованието",
 		"tags": ["Education", "Computer Science", "Societal Skills"],
-		"isEasy": "yes"
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
@@ -245,5 +277,6 @@
 		"tags": ["Mathematics"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
@@ -251,5 +284,6 @@
 		"tags": ["Web Development", "Software Engineering"],
 		"technologies": ["HTML", "CSS", "JavaScript"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -257,5 +291,6 @@
 		"tags": ["Web Development", "Software Engineering"],
 		"technologies": [".NET", "any", "HTML", "CSS"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -263,5 +298,6 @@
 		"tags": ["UI/UX & Digital Media", "Multimedia", "Software Engineering"],
 		"technologies": ["C++"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -269,5 +305,6 @@
 		"tags": ["Networking"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -275,11 +312,12 @@
 		"tags": ["Networking", "Cybersecurity"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
 		"name": "Концепти на информатичко општество",
 		"tags": ["Societal Skills", "Computer Science"],
-		"isEasy": "yes",
 		"technologies": ["any"],
+		"isEasy": true,
 		"evaluation": ["Theory", "Project"]
 	},
@@ -287,5 +325,6 @@
 		"name": "Медиуми и комуникации",
 		"tags": ["Multimedia", "Societal Skills"],
-		"isEasy": "yes",
+		"technologies": [],
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -293,6 +332,7 @@
 		"name": "Мултимедијални технологии",
 		"tags": ["Multimedia"],
-		"isEasy": "yes",
-		"evaluation": ["Theory + Practical"]
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -300,9 +340,13 @@
 		"tags": ["Software Engineering", "Computer Science"],
 		"technologies": ["Kotlin"],
-		"evaluation": ["Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
 		"name": "Квантно пресметување",
-		"tags": ["Computer Science", "Physics", "Mathematics"]
+		"tags": ["Computer Science", "Physics", "Mathematics"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -314,9 +358,12 @@
 		],
 		"technologies": ["Docker", "Java"],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
 		"name": "Основи на комуникациски системи",
 		"tags": ["Networking", "Physics"],
+		"technologies": [],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	},
@@ -324,5 +371,7 @@
 		"name": "Основи на теоријата на информации",
 		"tags": ["Computer Science", "Mathematics"],
-		"evaluation": ["Theory + Practical"]
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -330,10 +379,13 @@
 		"tags": ["Software Engineering", "Cloud Engineering & DevOps"],
 		"technologies": ["Git", "Docker"],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
 		"name": "Теорија на информации со дигитални комуникации",
 		"tags": ["Computer Science", "Mathematics"],
-		"evaluation": ["Theory + Practical"]
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -341,5 +393,6 @@
 		"tags": ["Societal Skills", "Systems Infrastructure"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
@@ -351,5 +404,6 @@
 		],
 		"technologies": ["jQuery", "Figma"],
-		"evaluation": ["Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -357,4 +411,5 @@
 		"tags": ["AI / ML", "Software Engineering", "Computer Science"],
 		"technologies": ["Python"],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	},
@@ -362,6 +417,7 @@
 		"name": "Администрација на мрежи",
 		"tags": ["Networking", "Systems Infrastructure", "Cybersecurity"],
-		"evaluation": ["Theory", "Project"],
-		"technologies": []
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Theory", "Project"]
 	},
 	{
@@ -369,10 +425,13 @@
 		"tags": ["Systems Infrastructure", "Networking", "Cybersecurity"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
 		"name": "Бази на податоци",
 		"tags": ["Databases", "Software Engineering"],
-		"evaluation": ["Theory + Code", "Project"]
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -383,5 +442,7 @@
 			"Software Engineering"
 		],
-		"evaluation": ["Theory + Practical", "Project"]
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
@@ -389,20 +450,27 @@
 		"tags": ["Web Development", "Software Engineering"],
 		"technologies": ["Spring"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
 		"name": "Визуелизација",
 		"tags": ["UI/UX & Digital Media", "Data Science", "Multimedia"],
-		"isEasy": "yes"
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
 		"name": "Виртуелизација",
 		"tags": ["Cloud Engineering & DevOps", "Systems Infrastructure"],
-		"evaluation": ["Theory + Practical", "Project"]
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
 		"name": "Вовед во мрежна наука",
 		"tags": ["Networking", "Data Science", "Computer Science"],
-		"isEasy": "yes"
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
@@ -410,26 +478,27 @@
 		"tags": ["Data Science", "Computer Science", "AI / ML"],
 		"technologies": ["Python"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
 		"name": "Географски информациски системи",
 		"tags": ["Data Science"],
-		"isEasy": "yes"
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
 		"name": "Дигитална форензика",
 		"tags": ["Cybersecurity", "Systems Infrastructure"],
-		"evaluation": ["Theory", "Project"],
-		"technologies": [],
-		"isEasy": "yes"
-	},
-	{
-		"name": "Вовед во паметни градови",
-		"tags": ["Embedded Systems", "Data Science", "Networking", "AI / ML"]
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": ["Theory", "Project"]
 	},
 	{
 		"name": "Дигитални библиотеки",
 		"tags": ["Computer Science"],
-		"isEasy": "yes"
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
@@ -441,4 +510,5 @@
 		],
 		"technologies": ["any"],
+		"isEasy": false,
 		"evaluation": ["Theory", "Project"]
 	},
@@ -451,5 +521,6 @@
 		],
 		"technologies": ["Figma", "Django", "HTML", "CSS"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -457,6 +528,6 @@
 		"tags": ["Education", "Software Engineering"],
 		"technologies": [],
-		"evaluation": ["Theory", "Project"],
-		"isEasy": "yes"
+		"isEasy": true,
+		"evaluation": ["Theory", "Project"]
 	},
 	{
@@ -469,5 +540,6 @@
 		],
 		"technologies": ["React"],
-		"evaluation": ["Theory + Code", "Project", "PROVERI"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -480,5 +552,6 @@
 		],
 		"technologies": [".NET"],
-		"evaluation": ["Theory + Practical", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
@@ -486,5 +559,6 @@
 		"tags": ["Cybersecurity", "Networking"],
 		"technologies": ["any"],
-		"evaluation": ["Theory + Practical", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
@@ -494,15 +568,15 @@
 			"Systems Infrastructure",
 			"Software Engineering"
-		]
+		],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Компјутерска електроника",
-		"tags": ["Computer Architecture", "Embedded Systems", "Physics"]
-	},
-	{
-		"name": "Математика 2",
-		"tags": ["Mathematics", "Computer Science"],
-		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"tags": ["Computer Architecture", "Embedded Systems", "Physics"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -510,10 +584,13 @@
 		"tags": ["Societal Skills", "Education"],
 		"technologies": [],
-		"evaluation": ["Theory", "Project"],
-		"isEasy": "yes"
+		"isEasy": true,
+		"evaluation": ["Theory", "Project"]
 	},
 	{
 		"name": "Компјутерски звук, музика и говор",
-		"tags": ["Multimedia", "Software Engineering", "UI/UX & Digital Media"]
+		"tags": ["Multimedia", "Software Engineering", "UI/UX & Digital Media"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -525,9 +602,13 @@
 		],
 		"technologies": ["Git", "Docker", "Jenkins", "Kubernetes"],
-		"evaluation": ["Theory + Practical", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
 		"name": "Криптографија",
-		"tags": ["Cybersecurity", "Mathematics", "Computer Science"]
+		"tags": ["Cybersecurity", "Mathematics", "Computer Science"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -535,5 +616,6 @@
 		"tags": ["Mathematics", "Computer Science", "Data Science"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -541,15 +623,20 @@
 		"tags": ["AI / ML", "Data Science", "Computer Science"],
 		"technologies": ["Python"],
-		"evaluation": ["Theory + Practical", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
 		"name": "Мерење и анализа на сообраќај",
 		"tags": ["Networking", "Data Science", "Cybersecurity"],
-		"isEasy": "yes"
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
 		"name": "Сајбер безбедност",
 		"tags": ["Cybersecurity", "Networking"],
-		"technologies": []
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -557,5 +644,6 @@
 		"tags": ["Multimedia", "Networking"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
@@ -567,9 +655,7 @@
 			"Computer Architecture"
 		],
-		"isEasy": "yes"
-	},
-	{
-		"name": "Тестирање на софтвер",
-		"tags": ["Software Engineering"]
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
@@ -581,5 +667,6 @@
 		],
 		"technologies": ["Vue", "HTML", "CSS"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -590,5 +677,8 @@
 			"Computer Architecture",
 			"Software Engineering"
-		]
+		],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -598,5 +688,8 @@
 			"Computer Science",
 			"Software Engineering"
-		]
+		],
+		"technologies": ["C++"],
+		"isEasy": false,
+		"evaluation": ["Project"]
 	},
 	{
@@ -608,11 +701,14 @@
 			"Computer Science"
 		],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Персонализирано учење",
 		"tags": ["Education", "Data Science", "Web Development"],
-		"isEasy": "yes",
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
@@ -620,9 +716,13 @@
 		"tags": ["Data Science", "AI / ML", "Computer Science"],
 		"technologies": ["Python"],
-		"evaluation": ["Project", "Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Project", "Theory", "Code"]
 	},
 	{
 		"name": "Процесирање на сигналите",
-		"tags": ["Computer Science", "Mathematics", "Multimedia"]
+		"tags": ["Computer Science", "Mathematics", "Multimedia"],
+		"technologies": ["Python"],
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -630,4 +730,5 @@
 		"tags": ["Game Development", "AI / ML", "Software Engineering"],
 		"technologies": [],
+		"isEasy": false,
 		"evaluation": []
 	},
@@ -636,5 +737,5 @@
 		"tags": ["Societal Skills", "Education"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -643,11 +744,6 @@
 		"tags": ["Education", "Societal Skills"],
 		"technologies": [],
-		"isEasy": "yes",
-		"evaluation": ["Theory"]
-	},
-	{
-		"name": "Сензорски системи",
-		"tags": ["Embedded Systems", "Networking", "Data Science"],
-		"nema kanal": ""
+		"isEasy": true,
+		"evaluation": ["Theory"]
 	},
 	{
@@ -657,15 +753,22 @@
 			"Cloud Engineering & DevOps",
 			"Web Development"
-		]
+		],
+		"technologies": ["Kotlin"],
+		"isEasy": false,
+		"evaluation": ["Theory", "Project"]
 	},
 	{
 		"name": "Современи компјутерски архитектури",
 		"tags": ["Computer Architecture"],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Софтверски дефинирана безбедност",
 		"tags": ["Cybersecurity", "Networking", "Cloud Engineering & DevOps"],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -673,5 +776,6 @@
 		"tags": ["Software Engineering"],
 		"technologies": ["Java"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -683,5 +787,7 @@
 			"Data Science"
 		],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -689,5 +795,5 @@
 		"tags": ["Education"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory", "Project"]
 	},
@@ -696,5 +802,6 @@
 		"tags": ["Computer Science", "Mathematics"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
@@ -706,19 +813,28 @@
 			"Computer Architecture"
 		],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Администрација на бази податоци",
 		"tags": ["Databases", "Systems Infrastructure"],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Анализа и дизајн на ИС",
-		"tags": ["Software Engineering", "Societal Skills"]
+		"tags": ["Software Engineering", "Societal Skills"],
+		"technologies": ["any"],
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
 	},
 	{
 		"name": "Биолошки инспирирано пресметување",
 		"tags": ["AI / ML", "Computer Science"],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -726,4 +842,5 @@
 		"tags": ["Cybersecurity", "Software Engineering", "Computer Science"],
 		"technologies": [],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	},
@@ -732,4 +849,5 @@
 		"tags": ["Web Development", "Software Engineering", "AI / ML"],
 		"technologies": [],
+		"isEasy": false,
 		"evaluation": ["Project", "Theory"]
 	},
@@ -737,11 +855,13 @@
 		"name": "Веб пребарувачки системи",
 		"tags": ["Web Development", "Databases", "Computer Science"],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Виртуелна реалност",
 		"tags": ["UI/UX & Digital Media", "Multimedia"],
-		"isEasy": "yes",
 		"technologies": ["Unity"],
+		"isEasy": true,
 		"evaluation": ["Theory", "Project"]
 	},
@@ -749,24 +869,42 @@
 		"name": "Вовед во анализа на временските серии",
 		"tags": ["Data Science", "Mathematics", "AI / ML"],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Вовед во биоинформатиката",
-		"tags": ["Data Science", "AI / ML", "Computer Science", "Databases"]
+		"tags": ["Data Science", "Computer Science"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
 		"name": "Вовед во когнитивни науки",
 		"tags": ["AI / ML", "Computer Science"],
-		"isEasy": "yes",
-		"technologies": [],
-		"evaluation": ["Theory", "Project"]
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": ["Theory", "Project"]
+	},
+	{
+		"name": "Вовед во паметни градови",
+		"tags": ["Embedded Systems", "Data Science", "Networking", "AI / ML"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Вовед во препознавање на облици",
-		"tags": ["AI / ML", "Data Science", "Computer Science"]
+		"tags": ["AI / ML", "Data Science", "Computer Science"],
+		"technologies": ["any"],
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
 		"name": "Дигитална постпродукција",
-		"tags": ["Multimedia", "UI/UX & Digital Media"]
+		"tags": ["Multimedia", "UI/UX & Digital Media"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -774,11 +912,6 @@
 		"tags": ["Networking"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical", "Project"]
-	},
-	{
-		"name": "Дипломска работа",
-		"tags": [],
-		"technologies": [],
-		"evaluation": ["Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
@@ -789,5 +922,8 @@
 			"Networking",
 			"Software Engineering"
-		]
+		],
+		"technologies": ["Java"],
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -798,5 +934,7 @@
 			"Systems Infrastructure"
 		],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -804,4 +942,5 @@
 		"tags": ["Cybersecurity", "Networking"],
 		"technologies": [],
+		"isEasy": false,
 		"evaluation": ["Theory", "Project"]
 	},
@@ -810,6 +949,6 @@
 		"tags": [],
 		"technologies": [],
-		"isEasy": "yes",
-		"nema kanal": ""
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
@@ -821,10 +960,13 @@
 		],
 		"technologies": ["Laravel"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
 		"name": "Иновации во ИКТ",
 		"tags": ["Societal Skills", "Computer Science", "Software Engineering"],
-		"isEasy": "yes"
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": ["Theory", "Project"]
 	},
 	{
@@ -832,4 +974,5 @@
 		"tags": ["AI / ML", "Data Science"],
 		"technologies": ["Python"],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	},
@@ -838,5 +981,6 @@
 		"tags": ["AI / ML", "Software Engineering", "Data Science"],
 		"technologies": ["Python"],
-		"nema kanal": ""
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -849,5 +993,7 @@
 			"AI / ML"
 		],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -860,4 +1006,5 @@
 		],
 		"technologies": ["Blender"],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	},
@@ -869,5 +1016,7 @@
 			"Computer Architecture"
 		],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -875,5 +1024,5 @@
 		"tags": ["Societal Skills", "Education"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -882,16 +1031,19 @@
 		"tags": ["AI / ML", "Multimedia", "Data Science"],
 		"technologies": ["Python"],
-		"evaluation": ["Theory + Practical", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Project"]
 	},
 	{
 		"name": "Менаџмент информациски системи",
 		"tags": ["Software Engineering", "Societal Skills"],
-		"isEasy": "yes"
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": ["Theory", "Project"]
 	},
 	{
 		"name": "Методика на информатиката",
 		"tags": ["Education", "Computer Science"],
-		"isEasy": "yes",
-		"technologies": [],
+		"technologies": [],
+		"isEasy": true,
 		"evaluation": ["Project"]
 	},
@@ -899,7 +1051,7 @@
 		"name": "Методологија на истражувањето во ИКТ",
 		"tags": ["Societal Skills", "Computer Science"],
-		"isEasy": "yes",
-		"evaluation": ["Theory"],
-		"technologies": []
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": ["Theory"]
 	},
 	{
@@ -907,4 +1059,5 @@
 		"tags": ["Software Engineering", "UI/UX & Digital Media", "Databases"],
 		"technologies": ["Swift"],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	},
@@ -913,4 +1066,5 @@
 		"tags": ["Software Engineering", "UI/UX & Digital Media", "Databases"],
 		"technologies": ["Flutter", "any"],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	},
@@ -919,4 +1073,5 @@
 		"tags": ["Software Engineering", "UI/UX & Digital Media", "Databases"],
 		"technologies": ["Kotlin"],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	},
@@ -924,30 +1079,42 @@
 		"name": "Моделирање и менаџирање на бизнис процеси",
 		"tags": ["Societal Skills", "Software Engineering"],
-		"isEasy": "yes",
-		"technologies": [""],
-		"evaluation": ["Theory"]
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": ["Theory", "Project"]
 	},
 	{
 		"name": "Моделирање и симулација",
 		"tags": ["Computer Science", "Software Engineering", "Data Science"],
-		"isEasy": "yes",
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
 		"name": "Модерни трендови во роботика",
 		"tags": ["Embedded Systems", "AI / ML", "Software Engineering"],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Мрежна и мобилна форензика",
-		"tags": ["Cybersecurity", "Networking", "Embedded Systems"]
+		"tags": ["Cybersecurity", "Networking", "Embedded Systems"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Project"]
 	},
 	{
 		"name": "Напредна интеракција човек компјутер",
-		"tags": ["UI/UX & Digital Media", "Software Engineering"]
+		"tags": ["UI/UX & Digital Media", "Software Engineering"],
+		"technologies": ["any"],
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
 		"name": "Напредни бази на податоци",
-		"tags": ["Databases", "Software Engineering", "Data Science"]
+		"tags": ["Databases", "Software Engineering", "Data Science"],
+		"technologies": ["SQL"],
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -959,5 +1126,7 @@
 			"Databases"
 		],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -965,5 +1134,6 @@
 		"tags": ["Databases", "Software Engineering", "Cloud Engineering & DevOps"],
 		"technologies": ["NoSQL"],
-		"evaluation": ["Theory + Code", "Project"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -975,5 +1145,7 @@
 			"Computer Science"
 		],
-		"technologies": ["Python"]
+		"technologies": ["Python"],
+		"isEasy": false,
+		"evaluation": ["Project"]
 	},
 	{
@@ -985,9 +1157,14 @@
 			"Societal Skills"
 		],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Оптички мрежи",
-		"tags": ["Networking", "Physics"]
+		"tags": ["Networking", "Physics"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Project"]
 	},
 	{
@@ -998,5 +1175,8 @@
 			"Networking",
 			"Software Engineering"
-		]
+		],
+		"technologies": ["Java"],
+		"isEasy": false,
+		"evaluation": ["Theory", "Code", "Project"]
 	},
 	{
@@ -1004,5 +1184,6 @@
 		"tags": ["Societal Skills"],
 		"technologies": [],
-		"isEasy": "yes"
+		"isEasy": true,
+		"evaluation": []
 	},
 	{
@@ -1015,4 +1196,5 @@
 		],
 		"technologies": ["Python"],
+		"isEasy": false,
 		"evaluation": ["Code", "Project"]
 	},
@@ -1020,5 +1202,7 @@
 		"name": "Програмски јазици и компајлери",
 		"tags": ["Computer Science", "Software Engineering", "Mathematics"],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -1026,5 +1210,6 @@
 		"tags": ["Software Engineering", "Computer Science"],
 		"technologies": [],
-		"evaluation": ["Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -1032,4 +1217,5 @@
 		"tags": ["Data Science", "AI / ML", "Cloud Engineering & DevOps"],
 		"technologies": [],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	},
@@ -1038,5 +1224,5 @@
 		"tags": ["Education"],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Project"]
 	},
@@ -1049,5 +1235,7 @@
 			"Societal Skills"
 		],
-		"isEasy": "yes"
+		"technologies": ["Python"],
+		"isEasy": true,
+		"evaluation": ["Theory"]
 	},
 	{
@@ -1055,5 +1243,6 @@
 		"tags": ["Databases", "Data Science", "Software Engineering"],
 		"technologies": ["SQL"],
-		"evaluation": ["Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -1065,4 +1254,5 @@
 		],
 		"technologies": ["C", "C++"],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	},
@@ -1074,15 +1264,22 @@
 			"Software Engineering",
 			"Cybersecurity"
-		]
+		],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Теорија на графови и социјални мрежи",
 		"tags": ["Mathematics", "Computer Science", "Data Science", "Networking"],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
 		"name": "Споделување и пресметување во толпа",
 		"tags": ["Data Science"],
-		"nema kanal": ""
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -1090,5 +1287,5 @@
 		"tags": [],
 		"technologies": ["any"],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": ["Project"]
 	},
@@ -1096,6 +1293,6 @@
 		"name": "Управување со ИКТ проекти",
 		"tags": ["Societal Skills", "Software Engineering"],
-		"isEasy": "yes",
 		"technologies": ["Git"],
+		"isEasy": true,
 		"evaluation": ["Theory"]
 	},
@@ -1104,5 +1301,6 @@
 		"tags": ["Computer Science", "Software Engineering"],
 		"technologies": ["Java"],
-		"evaluation": ["Theory + Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Code"]
 	},
 	{
@@ -1110,5 +1308,6 @@
 		"tags": ["Mathematics", "Data Science", "Computer Science"],
 		"technologies": ["R"],
-		"evaluation": ["Theory + Practical", "Code"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical", "Code"]
 	},
 	{
@@ -1116,5 +1315,27 @@
 		"tags": ["Mathematics"],
 		"technologies": [],
-		"evaluation": ["Theory + Practical"]
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
+	},
+	{
+		"name": "Математика 2",
+		"tags": ["Mathematics", "Computer Science"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": ["Theory", "Practical"]
+	},
+	{
+		"name": "Тестирање на софтвер",
+		"tags": ["Software Engineering"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
+	},
+	{
+		"name": "Сензорски системи",
+		"tags": ["Embedded Systems", "Networking", "Data Science"],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -1125,5 +1346,8 @@
 			"Software Engineering",
 			"UI/UX & Digital Media"
-		]
+		],
+		"technologies": [],
+		"isEasy": false,
+		"evaluation": []
 	},
 	{
@@ -1131,5 +1355,5 @@
 		"tags": [],
 		"technologies": [],
-		"isEasy": "yes",
+		"isEasy": true,
 		"evaluation": []
 	},
@@ -1138,4 +1362,5 @@
 		"tags": [],
 		"technologies": ["any"],
+		"isEasy": false,
 		"evaluation": ["Project"]
 	}
Index: backend/subjects/management/data/elective.json
===================================================================
--- backend/subjects/management/data/elective.json	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/data/elective.json	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -288,8 +288,4 @@
 		},
 		"W": {
-			"Веројатност и статистика": {
-				"subject": "Веројатност и статистика",
-				"semester": 3
-			},
 			"Мултимедијални технологии": {
 				"subject": "Мултимедијални технологии",
Index: backend/subjects/management/data/information.json
===================================================================
--- backend/subjects/management/data/information.json	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/data/information.json	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -719,10 +719,4 @@
 		"level": 3,
 		"link": "https://finki.ukim.mk/subject/F23L3S063"
-	},
-	{
-		"code": "F18L3S168, F23L3S168",
-		"course": "Дипломска работа",
-		"level": 3,
-		"link": "https://finki.ukim.mk/subject/F23L3S168"
 	},
 	{
Index: backend/subjects/management/data/mandatory.json
===================================================================
--- backend/subjects/management/data/mandatory.json	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/data/mandatory.json	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -303,5 +303,5 @@
 			"Веројатност и статистика",
 			"Компјутерски мрежи и безбедност",
-			"F23L2W",
+			"Линеарна алгебра и примени",
 			"F23L2W"
 		],
@@ -316,7 +316,7 @@
 			"Бази на податоци",
 			"Веб програмирање",
-			"Линеарна алгебра и примени",
 			"Паралелно и дистрибуирано процесирање",
-			"Напредно програмирање"
+			"Напредно програмирање",
+			"F23L2W"
 		],
 		"6": [
@@ -331,5 +331,5 @@
 			"Програмски парадигми",
 			"Методологија на истражувањето во ИКТ",
-			"F23L2W",
+			"F23L3W",
 			"F23L3W"
 		],
Index: backend/subjects/management/data/subject_details.json
===================================================================
--- backend/subjects/management/data/subject_details.json	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/data/subject_details.json	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -350,5 +350,5 @@
 		"mandatory": true,
 		"mandatoryFor": ["IE23"],
-		"semester": 2,
+		"semester": 4,
 		"season": "S",
 		"electiveFor": ["IMB23", "KI23", "KN23", "PIT23", "SIIS23"],
@@ -2194,5 +2194,5 @@
 		"mandatory": true,
 		"mandatoryFor": ["KN23"],
-		"semester": 5,
+		"semester": 3,
 		"season": "W",
 		"electiveFor": ["IE23", "IMB23", "KI23", "PIT23", "SIIS23"],
@@ -4575,5 +4575,5 @@
 			"credits": 36
 		},
-		"activated": true,
+		"activated": false,
 		"participants": [0, 0, 0],
 		"mandatory": true,
Index: backend/subjects/management/data/subjects_by_program.json
===================================================================
--- backend/subjects/management/data/subjects_by_program.json	(revision 2018d83bccc98844ed54c660f7cc426cda65a7c5)
+++ backend/subjects/management/data/subjects_by_program.json	(revision e0efd4c37567ff0c4a7a63275f751bbcb2bca8ad)
@@ -381,5 +381,5 @@
 	},
 	"Линеарна алгебра и примени": {
-		"semester": 5,
+		"semester": 3,
 		"programs": ["KN23"]
 	},