Adding support for categorical values.