Updated logging for amazon