Updated classes focuses