More command consistency