Minor improvement for Commands