Add some more entity types