Added more diagnostic information