Fixed model mapping from 20 to 21 to account for updated model 21