Changed the command protocol to allow for some future changes