Comment on Support for other entity types