Add support for item groups and categories