Moved device to TouchData and added respective ids in JSON response