Add more logging for better diagnostics & debugging