Added whether class