replaced IdentifiedEntity with BaseEntity