Samshull/radar 92 user data

These changes should have no adverse effects on the normal operation of the client, but add the ability to handle additional data once the server is capable of it as well.

@vanchi-zendesk