Enhance show command