Add module menu items back in, using new command system