Added support for accordions