*Added BaseEntity