Adding BaseEntity