Add support for UserId & Location data.