added UUIDBasedEntity