Add category support for mixtures.
Merge branch 'add-category' into develop