Further refactoring work for submenu support
No submenus yet but infrastructure to support it is there now.
Version => 1.9.0