Refactoring to get Menu bar contributions and ToolBar contributions working the same way