Added managing of categories.