Updated how userdata is passed to the client