Update Server to use menuItem instead of key table