Added support for Show command