Added more detailed information for matching.