Don't replace the native menu entry any more. Code refactoring between the 2 wizards Improve multi-company support