Add self.includeEntities

Add ability to turn on or off the inclusion of entities. The default is
NO.