Added BaseEntity class