Fixed adding devices by token