Small changes to Command related classes