Adding more logging statements