Support for both collapsed and expanded classes