Added support for all entity types