Categorical data enhancements