Updated class selection