Added some changes to AcademicDesciplineSettings class