Added initial support for controller/menu item functionality