Added BaseEntity, Category, Person