Rewrote categorical value-handling