Adding more logging