Added some functionality to the command class