[#42518161] refactor entity_type and add entity_subtype.