Added Rule classes (35 classes left, down from 48)