Added support for any command