Updated entity emailer to use entity kinds rather than entity types