Follow class extraction change