Added support for adding to menu