Update toString() methods on Entity layer