Add class substitution for state #41