FIX revert feature sets to classes