Expanding ther class selection