Added some stuff for conditional menu items