added support for debug toolbar