Added more fine-grained equality in entry.