Add thread id for better logging