Updated the device to use its service rather than notifications service