changes in Commands design