Added support for accessories