added BaseEntity