Added support for show / list commands