Small refactor, and configuration for 40 new categories.