Before class extraction