Improve menu handler interface