Small changes to the Command Framework