Updated with ability to add new category