Logging improvements and add machine_id to request