Refactor: enchancing curricular structure API