Added ToolbarWrapper to remove hard dependency on the Toolbar.dll