Added features for classes and feats