[#42326927] Get rid of type parameter for data sources and use entity_type instead