Ready for selectors instead of hardcoded entity names.