Added categorical variable support for model export