added menu and new entity normalization