Add a proper Command class