added menu support