Improve categorize saving. Add category.