Add more logging statements