Further implementations on menu. Changed plugin api.