Added support for adding / removing categories.