Keywords added to classes, first pass