Some protocol changes