More protocol changes