Updates to device token format