Add more diagnostic information