Changed device name/service types to text in database