Add support for any entity type