Add criterion capture
Add criterions for 99 EECS-csie