Adding support for toolbar