Added BaseEntity, City and Flight entities.