Made changes to command processing