Added BaseEntity