Fixes scope issues with user_data
Updating to protocol v6