Added CSAIL, made schema more consistent