Added managing of categories