Show commands enhancement