Add support for collpsable self text