Updated logging to support multiple devices