add wrapping of long device tokens