Improved diagnostic information