Add remaining model types