Get rid of the explicit Support intermediary model