More robust syllabus with better documentation