including expanded classes