Add more logging info