Updated Menu class - now supports more options