Modified entities with proper toString, equals, hashCode and
implementing Serializable