Replaced @name and @category with a combined @id