Change dataset handling to stu annotations