Add Types to the User Stream Data

This PR will introduce type and mappings for the user stream data.  This PR has been created to discuss this change, do not merge this until the change is complete.