Add model enum instead of type