Update toString() methods in entity classes