Added additional entity types to plugin.