Updating commands to match spec