Fixing output_classes for CIS state optimizations