Added support for the collapsed status