Added support for category definition and assignment