Adding more logging info