Added 'serializable' to entity classes