Add DeviceToUser and DeviceToUserDistance