Some improvements to Command and Commands classes