Extract to individual classes