Added support for all menu arguments