Added Name & Category (take 2)