Added logic for feats